Commit Graph

4860 Commits (18bc18be765a75869509f14244f51d47de5fda66)

Author SHA1 Message Date
tangqian 18bc18be76 Merge branch 'feature/mall_product' into test 2023-06-20 16:57:19 +08:00
tangqian b24ff62342 fix: 订单管理备注和订单查询 2023-06-20 16:56:55 +08:00
tangqian 6849a68446 Merge branch 'feature/mall_product' into test 2023-06-20 16:36:54 +08:00
tangqian 51378e0a22 fix: 订单管理备注和订单查询 2023-06-20 16:36:28 +08:00
Jruome acb1e72a57 管理端 退款订单管理 2023-06-20 15:58:35 +08:00
tangqian bccc325bda Merge branch 'feature/mall_product' into test 2023-06-20 15:55:02 +08:00
tangqian ba45dc7202 fix: 订单管理备注和订单查询 2023-06-20 15:54:51 +08:00
tangqian 9e1a653dbe Merge branch 'feature/mall_product' into test 2023-06-20 15:41:32 +08:00
tangqian b7b9c15b18 fix: 订单管理备注和订单查询 2023-06-20 15:40:57 +08:00
tangqian 714650a275 Merge branch 'feature/mall_product' into test 2023-06-20 14:27:51 +08:00
tangqian e3d06db343 fix: 订单管理备注和订单查询 2023-06-20 14:27:36 +08:00
tangqian 9bb2ba3740 Merge branch 'feature/mall_product' into test 2023-06-20 12:11:09 +08:00
tangqian 932295c664 fix: 订单管理备注和订单查询 2023-06-20 12:10:42 +08:00
tangqian fe0e7ae3b9 fix: 订单管理备注和订单查询 2023-06-20 12:10:12 +08:00
tangqian c5c73744f0 Merge branch 'feature/mall_product' into test 2023-06-20 10:05:53 +08:00
tangqian 4aff4b3d03 fix: 定时任务补单 2023-06-20 10:04:04 +08:00
tangqian 8afd5700ab Merge branch 'feature/mall_product' into test 2023-06-19 18:07:08 +08:00
tangqian 0f36f07dc3 fix: 订单列表根据商户名称和退款状态查询 2023-06-19 18:06:52 +08:00
tangqian c6240b23b5 fix: 订单列表根据商户名称和退款状态查询 2023-06-19 18:05:40 +08:00
Jruome 5ae6e3481c Merge remote-tracking branch 'origin/master' 2023-06-19 17:28:58 +08:00
Jruome 8b78cc917e Merge remote-tracking branch 'origin/test' 2023-06-19 14:37:17 +08:00
Jruome 9d0790a24f 管理端 新增需求 2023-06-19 14:37:00 +08:00
tangqian 322d5aae1a Merge branch 'master' into feature/mall_product 2023-06-18 13:14:30 +08:00
tangqian 676b7c73a1 fix:app推广员只查询付款订单 2023-06-18 13:06:07 +08:00
tangqian 41c099eaf6 Merge branch 'feature/mall_product' into test 2023-06-17 16:43:26 +08:00
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