test合并到master 20230703 #20

Merged
TanGH merged 6 commits from test into master 2023-07-03 17:54:52 +08:00

6 Commits (master)

Author SHA1 Message Date
TanGH acc88820e5 Merge pull request '退款功能BUG修复(商户提现后余额不足时进行退款,微信支付返回异常后订单处于退款中的状态,未重置到未退款的状态)' (#19) from bugfix/tgh20230703 into test
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/19
2023-07-03 17:45:39 +08:00
TanGH f3087008d4 退款功能BUG修复(商户提现后余额不足时进行退款,微信支付返回异常后订单处于退款中的状态,未重置到未退款的状态) 2023-07-03 17:41:53 +08:00
TanGH 3cb06b2b74 Merge pull request 'H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》,增加前端提示(暂不修改其他逻辑)' (#18) from bugfix/tgh20230630 into test
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/18
2023-06-30 17:33:45 +08:00
TanGH cb28d6ba4e H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》,增加前端提示(暂不修改其他逻辑) 2023-06-30 17:32:58 +08:00
TanGH 047741d04c Merge pull request 'H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》' (#17) from bugfix/tgh20230630 into test
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/17
2023-06-30 10:52:32 +08:00
TanGH c0b5a4233a H5 BUG修复《编辑组织机构会导致system_dept表中parent_organization_name字段异常》 2023-06-30 10:46:42 +08:00