zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 81e3a97a42 Merge pull request 'test合并到master 20230703' (#20) from test into master master TanGH 2023-07-03 17:54:52 +0800
  • acc88820e5 Merge pull request '退款功能BUG修复（商户提现后余额不足时进行退款，微信支付返回异常后订单处于退款中的状态，未重置到未退款的状态）' (#19) from bugfix/tgh20230703 into test test TanGH 2023-07-03 17:45:39 +0800
  • f3087008d4 退款功能BUG修复（商户提现后余额不足时进行退款，微信支付返回异常后订单处于退款中的状态，未重置到未退款的状态） TanGH 2023-07-03 17:41:53 +0800
  • 3cb06b2b74 Merge pull request 'H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》，增加前端提示（暂不修改其他逻辑）' (#18) from bugfix/tgh20230630 into test TanGH 2023-06-30 17:33:45 +0800
  • cb28d6ba4e H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》，增加前端提示（暂不修改其他逻辑） TanGH 2023-06-30 17:32:58 +0800
  • 047741d04c Merge pull request 'H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》' (#17) from bugfix/tgh20230630 into test TanGH 2023-06-30 10:52:32 +0800
  • c0b5a4233a H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》 TanGH 2023-06-30 10:46:42 +0800
  • 1c0376f60c 管理端 批量更改发货状态进行二次确认提示 Jruome 2023-06-27 14:03:19 +0800
  • f7da38634b Merge remote-tracking branch 'origin/test' Jruome 2023-06-27 14:02:43 +0800
  • 7984f0ca9f fix:数据分析 feature/mall_product tangqian 2023-06-25 17:41:21 +0800
  • b272c2783a fix:数据分析 tangqian 2023-06-25 14:48:13 +0800
  • 877e40d7a0 Merge branch 'feature/mall_product' into test tangqian 2023-06-25 14:37:32 +0800
  • 6194189803 fix:数据分析 tangqian 2023-06-25 14:35:51 +0800
  • 6b3c96c8f9 fix:数据分析 tangqian 2023-06-25 12:02:12 +0800
  • 8a93752fbc 管理端 退款提示语修改 Jruome 2023-06-21 17:36:10 +0800
  • caaed12df4 Merge branch 'feature/mall_product' tangqian 2023-06-21 17:03:18 +0800
  • 79841d62ee fix: 订单管理备注和订单查询 tangqian 2023-06-21 17:01:18 +0800
  • 2ac2faf592 Merge remote-tracking branch 'origin/master' Jruome 2023-06-21 10:28:01 +0800
  • 6fa7a0103f 管理端 退款订单管理 Jruome 2023-06-20 18:03:44 +0800
  • 82d5f5408e Merge branch 'feature/mall_product' tangqian 2023-06-20 17:57:42 +0800
  • 3b4ad83dd0 fix: 订单管理备注和订单查询 tangqian 2023-06-20 17:55:02 +0800
  • bd806cc2ba Merge branch 'feature/mall_product' into test tangqian 2023-06-20 17:38:28 +0800
  • 7b919a32e4 fix: 订单管理备注和订单查询 tangqian 2023-06-20 17:38:16 +0800
  • 5846de1445 Merge branch 'feature/mall_product' into test tangqian 2023-06-20 17:27:36 +0800
  • 3948729a18 fix: 订单管理备注和订单查询 tangqian 2023-06-20 17:27:27 +0800
  • 18bc18be76 Merge branch 'feature/mall_product' into test tangqian 2023-06-20 16:57:19 +0800
  • b24ff62342 fix: 订单管理备注和订单查询 tangqian 2023-06-20 16:56:55 +0800
  • 6849a68446 Merge branch 'feature/mall_product' into test tangqian 2023-06-20 16:36:54 +0800
  • 51378e0a22 fix: 订单管理备注和订单查询 tangqian 2023-06-20 16:36:28 +0800
  • acb1e72a57 管理端 退款订单管理 Jruome 2023-06-20 15:58:35 +0800
  • bccc325bda Merge branch 'feature/mall_product' into test tangqian 2023-06-20 15:55:02 +0800
  • ba45dc7202 fix: 订单管理备注和订单查询 tangqian 2023-06-20 15:54:51 +0800
  • 9e1a653dbe Merge branch 'feature/mall_product' into test tangqian 2023-06-20 15:41:32 +0800
  • b7b9c15b18 fix: 订单管理备注和订单查询 tangqian 2023-06-20 15:40:57 +0800
  • 714650a275 Merge branch 'feature/mall_product' into test tangqian 2023-06-20 14:27:51 +0800
  • e3d06db343 fix: 订单管理备注和订单查询 tangqian 2023-06-20 14:27:36 +0800
  • 9bb2ba3740 Merge branch 'feature/mall_product' into test tangqian 2023-06-20 12:11:09 +0800
  • 932295c664 fix: 订单管理备注和订单查询 tangqian 2023-06-20 12:10:42 +0800
  • fe0e7ae3b9 fix: 订单管理备注和订单查询 tangqian 2023-06-20 12:10:12 +0800
  • c5c73744f0 Merge branch 'feature/mall_product' into test tangqian 2023-06-20 10:05:53 +0800
  • 4aff4b3d03 fix: 定时任务补单 tangqian 2023-06-20 10:04:04 +0800
  • 7e49674bd4 fix: 定时任务补单 tangqian 2023-06-20 10:01:56 +0800
  • 022b9d2c8f Merge branch 'feature/mall_product' tangqian 2023-06-19 18:07:20 +0800
  • 8afd5700ab Merge branch 'feature/mall_product' into test tangqian 2023-06-19 18:07:08 +0800
  • 0f36f07dc3 fix: 订单列表根据商户名称和退款状态查询 tangqian 2023-06-19 18:06:52 +0800
  • c6240b23b5 fix: 订单列表根据商户名称和退款状态查询 tangqian 2023-06-19 18:05:40 +0800
  • 5ae6e3481c Merge remote-tracking branch 'origin/master' Jruome 2023-06-19 17:28:58 +0800
  • 8b78cc917e Merge remote-tracking branch 'origin/test' Jruome 2023-06-19 14:37:17 +0800
  • 9d0790a24f 管理端 新增需求 Jruome 2023-06-19 14:37:00 +0800
  • 322d5aae1a Merge branch 'master' into feature/mall_product tangqian 2023-06-18 13:14:30 +0800
  • 676b7c73a1 fix:app推广员只查询付款订单 tangqian 2023-06-18 13:06:07 +0800
  • 41c099eaf6 Merge branch 'feature/mall_product' into test tangqian 2023-06-17 16:43:26 +0800
  • 9c88d5c6e1 fix:推广员导出 tangqian 2023-06-17 16:42:59 +0800
  • 66e4a6c6fc Merge branch 'feature/mall_product' tangqian 2023-06-16 17:43:04 +0800
  • cdf62a17da fix:推广员导出 tangqian 2023-06-16 17:42:47 +0800
  • 7ca2a339b2 管理端 首页修改 Jruome 2023-06-16 17:11:46 +0800
  • e85f2e75a7 Merge remote-tracking branch 'origin/master' Jruome 2023-06-16 15:12:59 +0800
  • 7910334283 管理端 推广员修改 Jruome 2023-06-16 15:04:30 +0800
  • a47200d78a Merge remote-tracking branch 'origin/test' Jruome 2023-06-16 15:03:45 +0800
  • 1813516c54 Merge branch 'feature/mall_product' tangqian 2023-06-16 14:35:09 +0800
  • 6be709216e fix:推广员导出 tangqian 2023-06-16 14:34:30 +0800
  • cb5b989e20 fix:推广员导出 tangqian 2023-06-16 14:12:21 +0800
  • 2e915fe106 test 分支 测试服内存配置 axzsd 2023-06-16 13:55:56 +0800
  • 77ffc74c3d fix:推广员导出 tangqian 2023-06-16 13:30:01 +0800
  • 8604602f83 fix:推广员导出 tangqian 2023-06-16 13:27:39 +0800
  • 5e74237e04 fix:推广员导出 tangqian 2023-06-16 13:25:27 +0800
  • ff734c3ac3 Merge branch 'feature/mall_product' tangqian 2023-06-16 13:21:05 +0800
  • 29608d4f69 Merge branch 'feature/mall_product' into test tangqian 2023-06-16 13:04:08 +0800
  • e99801eddd fix:推广员导出 tangqian 2023-06-16 13:03:56 +0800
  • 7c060b5a8b fix:推广员导出 tangqian 2023-06-16 13:01:17 +0800
  • 103354947b Merge branch 'feature/mall_product' into test tangqian 2023-06-16 11:53:52 +0800
  • ab863e67e1 fix:推广员导出 tangqian 2023-06-16 11:53:37 +0800
  • 1a49815b43 Merge remote-tracking branch 'origin/master' Jruome 2023-06-16 11:40:51 +0800
  • d707770dac Merge remote-tracking branch 'origin/test' Jruome 2023-06-16 11:37:35 +0800
  • f3a61cb8dd 管理端 推广员导出 Jruome 2023-06-16 11:37:00 +0800
  • 96f0f60549 Merge branch 'feature/mall_product' into test tangqian 2023-06-16 11:29:25 +0800
  • f0d3b5a72d fix:推广员导出 tangqian 2023-06-16 11:29:14 +0800
  • 82f9e16fe3 Merge remote-tracking branch 'origin/test' into test tangqian 2023-06-16 11:20:55 +0800
  • 1f44abfe66 Merge branch 'feature/mall_product' into test tangqian 2023-06-16 11:20:45 +0800
  • 5085f63772 管理端 推广员导入 Jruome 2023-06-16 11:14:35 +0800
  • c923cc93f0 fix:推广员导出 tangqian 2023-06-16 10:53:43 +0800
  • 581e6b74ae Merge branch 'feature/mall_product' into test tangqian 2023-06-16 10:37:41 +0800
  • 3a9b7376f2 fix:推广员导出 tangqian 2023-06-16 10:37:28 +0800
  • 6f7d2767e4 Merge branch 'feature/mall_product' into test tangqian 2023-06-16 09:47:02 +0800
  • b7dcf93fb3 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 tangqian 2023-06-16 09:46:49 +0800
  • 94bf7664ab Merge branch 'feature/mall_product' into test tangqian 2023-06-16 09:14:37 +0800
  • 538daff555 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 tangqian 2023-06-15 17:43:08 +0800
  • 683c14137c Merge branch 'feature/mall_product' tangqian 2023-06-15 16:20:17 +0800
  • 8d6bfcdcdd fix:修改用于测试跳转金额 tangqian 2023-06-15 16:20:04 +0800
  • 692263438c fix:修改用于测试跳转金额 tangqian 2023-06-15 14:07:00 +0800
  • 27d4c6b2ee Merge remote-tracking branch 'origin/test' Jruome 2023-06-15 10:34:18 +0800
  • 4391cfb64a 管理端 数据统计样式修改 Jruome 2023-06-15 10:33:52 +0800
  • 0a3e68c0d1 Merge branch 'feature/mall_product' into test tangqian 2023-06-15 09:41:52 +0800
  • 68db974170 fix:修改充值订单导出(未退款但是退款金额显示有金额) tangqian 2023-06-15 09:41:31 +0800
  • d092e0c23f Merge branch 'feature/mall_product' into test tangqian 2023-06-14 18:17:33 +0800
  • 72beac0b3a fix:修改充值订单导出(未退款但是退款金额显示有金额) tangqian 2023-06-14 18:17:21 +0800
  • e8ab6ea67b Merge remote-tracking branch 'origin/master' Jruome 2023-06-14 17:28:32 +0800
  • d415963aa3 管理端 商户数据统计 Jruome 2023-06-14 17:28:10 +0800
  • 1389bb9b91 fix:修改充值订单导出(未退款但是退款金额显示有金额) tangqian 2023-06-14 16:09:08 +0800
  • 6065350605 Merge branch 'feature/mall_product' into test tangqian 2023-06-13 16:40:38 +0800