desion
|
b932fcee12
|
框架升级
|
5 years ago |
|
desion
|
ec05042734
|
Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop
|
5 years ago |
liangyuyan
|
54e20e48be
|
Merge branch 'phoenix' into develop
# Conflicts:
# app/Admin/bootstrap.php
|
5 years ago |
|
liangyuyan
|
07ac0fe8c1
|
活动商品设置商品类目
|
5 years ago |
|
liangyuyan
|
5d1a2453c8
|
添加商品类目，在商品添加时选择类目
|
5 years ago |
|
liangyuyan
|
39b2890c56
|
复制商品功能
|
5 years ago |
|
lanzu_qsy
|
6e2ed43f0f
|
Merge branch 'qs_local_order' into develop
# Conflicts:
# app/Admin/Controllers/Test.php
# composer.lock
|
5 years ago |
|
lanzu_qsy
|
a39115a304
|
订单分账
|
5 years ago |
|
liangyuyan
|
fbcd46d63b
|
复制商品功能
|
5 years ago |
|
liangyuyan
|
a5ca325dbf
|
店铺添加账号，优惠券迁移（未完成）
|
5 years ago |
|
lanzu_qsy
|
7dca541eb6
|
订单状态变更
|
5 years ago |
|
liangyuyan
|
7f3bebbd3c
|
Merge branch 'coupon_remove' into phoenix
# Conflicts:
# app/Admin/Controllers/CouponTieController.php
# app/Admin/bootstrap.php
# dcat_admin_ide_helper.php
|
5 years ago |
|
lanzu_qsy
|
0ecfbfaabd
|
Merge branch 'qs_local_order' into develop
# Conflicts:
# app/Admin/Controllers/Test.php
# app/Admin/routes.php
# dcat_admin_ide_helper.php
|
5 years ago |
|
liangyuyan
|
12d2fcf791
|
优惠券迁移修改
|
5 years ago |
|
lanzu_qsy
|
1bbc14ee81
|
订单迁移
|
5 years ago |
|
lanzu_qsy
|
549e2322de
|
框架升级
|
5 years ago |
|
liangyuyan
|
c7ab9c6213
|
洗ims_cjdc_account表账号的店铺id和role到新表
|
5 years ago |
|
lanzu_qsy
|
510ad38e56
|
Merge branch 'qs_local_mp' into develop
|
5 years ago |
|
lanzu_qsy
|
dd765c509a
|
健壮服务商提现申请
|
5 years ago |
|
lanzu_qsy
|
c865b302f4
|
测试RPC
|
5 years ago |
|
lanzu_qsy
|
4a94ecf845
|
测试RPC
|
5 years ago |
|
liangyuyan
|
a3ab794468
|
店铺时间段验证
|
5 years ago |
|
lanzu_qsy
|
eda476e7c2
|
Merge branch 'qs_local_mp' into develop
# Conflicts:
# app/Admin/routes.php
|
5 years ago |
|
lanzu_qsy
|
72b303e00d
|
增加服务商提现申请短信通知
|
5 years ago |
|
liangyuyan
|
20a2323fde
|
Merge branch 'phoenix' into develop
|
5 years ago |
|
liangyuyan
|
09f83f808c
|
添加活动商品，分类绑定到首页加排序
|
5 years ago |
|
liangyuyan
|
9bc765ff3e
|
Merge branch 'phoenix' into develop
|
5 years ago |
|
liangyuyan
|
e3a5cd3f46
|
修改分类是否已在首页显示提示
|
5 years ago |
Mike
|
6c1daeb826
|
Merge branch 'onlineOrderStatis' into develop
* onlineOrderStatis:
取消google字体
# Conflicts:
# app/Admin/bootstrap.php
# app/Admin/routes.php
|
5 years ago |
|
Mike
|
0ac2bcb1ca
|
取消google字体
|
5 years ago |
|
liangyuyan
|
02c6d10d3b
|
添加旧商户钱包数据
|
5 years ago |
|
liangyuyan
|
d6beca388d
|
添加旧商户钱包数据
|
5 years ago |
|
lanzu_qsy
|
d11e732d9d
|
Merge branch 'qs_local_cs' into develop
# Conflicts:
# app/Admin/Common/Auth.php
|
5 years ago |
|
lanzu_qsy
|
b25d0e5665
|
社区类型变更
|
5 years ago |
|
lanzu_qsy
|
8d5ee82c42
|
Merge branch 'qs_local_cs' into develop
|
5 years ago |
|
lanzu_qsy
|
f5087bc6a0
|
1
|
5 years ago |
|
lanzu_qsy
|
b17cb758fa
|
Merge branch 'qs_local_cs' into develop
# Conflicts:
# app/Admin/Common/Auth.php
|
5 years ago |
|
lanzu_qsy
|
0d11f67ad3
|
调整社区获取可提现金额的类型
|
5 years ago |
|
lanzu_qsy
|
f4019fb4b7
|
Merge branch 'qs_local_cs' into develop
|
5 years ago |
|
lanzu_qsy
|
6701c569ff
|
1
|
5 years ago |
|
lanzu_qsy
|
ef61953b20
|
优化社区排序
|
5 years ago |
|
lanzu_qsy
|
67cd6f1936
|
Merge branch 'qs_local_cs' into develop
# Conflicts:
# app/Admin/Controllers/LanzuCsInfoController.php
|
5 years ago |
|
lanzu_qsy
|
14f9701f9a
|
优化社区列表排序
|
5 years ago |
|
liangyuyan
|
4a5ed3ef65
|
Merge branch 'phoenix' into develop
|
5 years ago |
|
liangyuyan
|
ac92fe8186
|
修改获取小程序配置信息改为从.env获取
|
5 years ago |
|
lanzu_qsy
|
16d2a26b78
|
Revert "社区添加增加了事物,优化数据列表排序"
This reverts commit 961ce2f194.
|
5 years ago |
|
lanzu_qsy
|
961ce2f194
|
社区添加增加了事物,优化数据列表排序
|
5 years ago |
|
lanzu_qsy
|
7667477293
|
服务提现申请短信通知
|
5 years ago |
|
liangyuyan
|
154c04a237
|
Merge branch 'phoenix' into develop
|
5 years ago |
|
liangyuyan
|
f4b9be44fa
|
banner修改列表
|
5 years ago |
