Commit Graph

4711 Commits (d82c3579109c16a18eec5b604d70976cfddbee08)

Author SHA1 Message Date
tangqian d441005778 Merge branch 'feature/mall_product' 2023-06-01 11:43:54 +08:00
tangqian e97a387aa5 fix: 修改部门 2023-06-01 11:43:28 +08:00
perry 296af91986 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-06-01 11:29:43 +08:00
perry 144e858710 部门 2023-06-01 11:29:32 +08:00
tangqian bec5e56add fix: 修改部门 2023-06-01 11:27:49 +08:00
tangqian 5a5c69421c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 11:27:17 +08:00
tangqian 06a0f96bf1 fix: 修改部门 2023-06-01 11:27:11 +08:00
Jruome 9326a31489 uniapp 时间戳转换 2023-06-01 11:25:20 +08:00
Jruome d6ea232b81 uniapp 时间戳转换 2023-06-01 11:24:27 +08:00
tangqian f847c508ae Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 11:24:25 +08:00
tangqian 451747bd24 fix: 修改部门 2023-06-01 11:24:18 +08:00
perry ad21968346 抽佣 2023-06-01 10:52:55 +08:00
TianYu 46686e4467 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-31 18:15:31 +08:00
TianYu d904d0b6de fix: 调整样式 2023-05-31 18:15:19 +08:00
tianyu 8d3ca8ee1b Merge pull request 'feature/mall_product' (#8) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/8
2023-05-31 18:15:16 +08:00
tangqian d7787d3193 fix: 修改部门 2023-05-31 18:10:48 +08:00
tangqian 45980a8c79 fix: 修改部门 2023-05-31 18:08:01 +08:00
tangqian a37b5f0fcc fix: 修改部门 2023-05-31 18:02:53 +08:00
tangqian 4a2765bd1b Merge branch 'feature/mall_product' 2023-05-31 17:46:31 +08:00
tangqian a4e18f6c9c fix: 修改后台相关 2023-05-31 17:44:13 +08:00
tangqian 3ea7926767 Merge branch 'feature/mall_product' 2023-05-31 17:29:41 +08:00
tangqian b86128c836 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-31 17:29:30 +08:00
tangqian 9f9cb30b03 fix: 修改后台相关 2023-05-31 17:29:24 +08:00
tianyu da15156869 Merge pull request 'feature/mall_product' (#7) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/7
2023-05-31 17:22:06 +08:00
TianYu 56c643d785 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-31 17:21:26 +08:00
TianYu c2debf6b82 feat: 增加用户协议 2023-05-31 17:21:08 +08:00
Jruome 4616cd7ee9 uniapp 充值规则样式 2023-05-31 17:20:51 +08:00
Jruome 5846fe8425 uniapp 充值规则 2023-05-31 16:25:34 +08:00
TianYu fd8d47ae81 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-31 15:00:37 +08:00
tianyu fc13565838 Merge pull request 'feature/mall_product' (#6) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/6
2023-05-31 15:00:36 +08:00
TianYu 145c966b6e fix: 抽佣明细-会员充值增加导出功能 2023-05-31 15:00:19 +08:00
tangqian 85adfec0db fix: 推广员提成信息查询和导出. 商城提成 2023-05-31 14:58:00 +08:00
tangqian 2741f1cefe fix: 推广员提成信息查询和导出. 商城提成 2023-05-31 13:56:41 +08:00
tangqian 160f9d306f Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-31 12:00:29 +08:00
tangqian 7619a9f220 fix: 推广员提成信息查询和导出. 商城提成 2023-05-31 12:00:24 +08:00
TianYu 039dee4f1d fix: 修复代码报错 2023-05-31 11:47:23 +08:00
TianYu 035dd77dd4 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-31 11:06:39 +08:00
TianYu 0125502394 fix: 修复bug 2023-05-31 11:06:26 +08:00
tangqian eadd9f2daa Merge branch 'master' into feature/mall_product 2023-05-31 10:30:01 +08:00
tangqian 4e56534695 fix: 商城提成 2023-05-31 10:29:41 +08:00
TianYu cceb889154 feat: 增加销售业绩 2023-05-31 09:37:30 +08:00
perry 0dfbe4a2d4 Merge remote-tracking branch 'origin/master' 2023-05-31 00:11:19 +08:00
perry 3292a07845 抽佣 2023-05-31 00:10:36 +08:00
tangqian 7bfe815a90 fix: 异常加上状态码 2023-05-30 20:51:02 +08:00
tangqian 3a9deab4a5 fix: 异常加上状态码 2023-05-30 20:48:19 +08:00
tangqian c737582293 fix: 异常加上状态码 2023-05-30 20:21:55 +08:00
tangqian 36956f30b8 Merge branch 'feature/mall_product' 2023-05-30 20:04:09 +08:00
tangqian e00d646c35 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-30 20:03:48 +08:00
tangqian ff2ef78be0 fix: 异常加上状态码 2023-05-30 20:03:43 +08:00
TianYu cfc33024b8 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-30 19:45:28 +08:00