Commit Graph

4885 Commits (master)

Author SHA1 Message Date
tangqian 9c88d5c6e1 fix:推广员导出 2023-06-17 16:42:59 +08:00
tangqian 66e4a6c6fc Merge branch 'feature/mall_product' 2023-06-16 17:43:04 +08:00
tangqian cdf62a17da fix:推广员导出 2023-06-16 17:42:47 +08:00
Jruome 7ca2a339b2 管理端 首页修改 2023-06-16 17:11:46 +08:00
Jruome e85f2e75a7 Merge remote-tracking branch 'origin/master' 2023-06-16 15:12:59 +08:00
Jruome 7910334283 管理端 推广员修改 2023-06-16 15:04:30 +08:00
Jruome a47200d78a Merge remote-tracking branch 'origin/test' 2023-06-16 15:03:45 +08:00
tangqian 1813516c54 Merge branch 'feature/mall_product' 2023-06-16 14:35:09 +08:00
tangqian 6be709216e fix:推广员导出 2023-06-16 14:34:30 +08:00
tangqian cb5b989e20 fix:推广员导出 2023-06-16 14:12:21 +08:00
axzsd 2e915fe106 test 分支
测试服内存配置
2023-06-16 13:55:56 +08:00
tangqian 77ffc74c3d fix:推广员导出 2023-06-16 13:30:01 +08:00
tangqian 8604602f83 fix:推广员导出 2023-06-16 13:27:39 +08:00
tangqian 5e74237e04 fix:推广员导出 2023-06-16 13:25:27 +08:00
tangqian ff734c3ac3 Merge branch 'feature/mall_product' 2023-06-16 13:21:05 +08:00
tangqian 29608d4f69 Merge branch 'feature/mall_product' into test 2023-06-16 13:04:08 +08:00
tangqian e99801eddd fix:推广员导出 2023-06-16 13:03:56 +08:00
tangqian 7c060b5a8b fix:推广员导出 2023-06-16 13:01:17 +08:00
tangqian 103354947b Merge branch 'feature/mall_product' into test 2023-06-16 11:53:52 +08:00
tangqian ab863e67e1 fix:推广员导出 2023-06-16 11:53:37 +08:00
Jruome 1a49815b43 Merge remote-tracking branch 'origin/master' 2023-06-16 11:40:51 +08:00
Jruome d707770dac Merge remote-tracking branch 'origin/test' 2023-06-16 11:37:35 +08:00
Jruome f3a61cb8dd 管理端 推广员导出 2023-06-16 11:37:00 +08:00
tangqian 96f0f60549 Merge branch 'feature/mall_product' into test 2023-06-16 11:29:25 +08:00
tangqian f0d3b5a72d fix:推广员导出 2023-06-16 11:29:14 +08:00
tangqian 82f9e16fe3 Merge remote-tracking branch 'origin/test' into test 2023-06-16 11:20:55 +08:00
tangqian 1f44abfe66 Merge branch 'feature/mall_product' into test 2023-06-16 11:20:45 +08:00
Jruome 5085f63772 管理端 推广员导入 2023-06-16 11:14:35 +08:00
tangqian c923cc93f0 fix:推广员导出 2023-06-16 10:53:43 +08:00
tangqian 581e6b74ae Merge branch 'feature/mall_product' into test 2023-06-16 10:37:41 +08:00
tangqian 3a9b7376f2 fix:推广员导出 2023-06-16 10:37:28 +08:00
tangqian 6f7d2767e4 Merge branch 'feature/mall_product' into test 2023-06-16 09:47:02 +08:00
tangqian b7dcf93fb3 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 2023-06-16 09:46:49 +08:00
tangqian 94bf7664ab Merge branch 'feature/mall_product' into test 2023-06-16 09:14:37 +08:00
tangqian 538daff555 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 2023-06-15 17:43:08 +08:00
tangqian 683c14137c Merge branch 'feature/mall_product' 2023-06-15 16:20:17 +08:00
tangqian 8d6bfcdcdd fix:修改用于测试跳转金额 2023-06-15 16:20:04 +08:00
tangqian 692263438c fix:修改用于测试跳转金额 2023-06-15 14:07:00 +08:00
Jruome 27d4c6b2ee Merge remote-tracking branch 'origin/test' 2023-06-15 10:34:18 +08:00
Jruome 4391cfb64a 管理端 数据统计样式修改 2023-06-15 10:33:52 +08:00
tangqian 0a3e68c0d1 Merge branch 'feature/mall_product' into test 2023-06-15 09:41:52 +08:00
tangqian 68db974170 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-15 09:41:31 +08:00
tangqian d092e0c23f Merge branch 'feature/mall_product' into test 2023-06-14 18:17:33 +08:00
tangqian 72beac0b3a fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-14 18:17:21 +08:00
Jruome e8ab6ea67b Merge remote-tracking branch 'origin/master' 2023-06-14 17:28:32 +08:00
Jruome d415963aa3 管理端 商户数据统计 2023-06-14 17:28:10 +08:00
tangqian 1389bb9b91 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-14 16:09:08 +08:00
tangqian 6065350605 Merge branch 'feature/mall_product' into test 2023-06-13 16:40:38 +08:00
tangqian 8c740295c2 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-13 16:40:23 +08:00
tangqian 0390415a48 Merge branch 'feature/mall_product' 2023-06-13 14:49:27 +08:00