1409 Commits

Author SHA1 Message Date
chenbo
43ae02fea1 update:商户合同添加备忘 2023-09-15 13:53:01 +08:00
mkm
9866432e21 更新 2023-09-15 13:37:21 +08:00
chenbo
7e54616332 update:其他任务提交时创建审批 2023-09-15 13:37:15 +08:00
mkm
2a65246c06 Merge pull request 'update:前端打包代码' (#23) from master-fix-0914 into master
Reviewed-on: #23
2023-09-14 18:52:21 +08:00
chenbo
236a1b51d7 update:前端打包代码 2023-09-14 18:51:07 +08:00
mkm
78df05614e Merge pull request 'master-fix-0914' (#22) from master-fix-0914 into master
Reviewed-on: #22
2023-09-14 18:43:28 +08:00
chenbo
f60346260c Merge branch 'master-fix-0914' into dev 2023-09-14 17:52:58 +08:00
chenbo
7d8041b340 update:商户详细地址 2023-09-14 17:51:23 +08:00
chenbo
602a9374ad update:提交其他任务 2023-09-14 14:42:16 +08:00
chenbo
5fe9723300 update:前端打包代码 2023-09-14 13:47:56 +08:00
chenbo
1c8717eb61 Merge branch 'master-fix-0914' into dev 2023-09-14 13:06:49 +08:00
chenbo
81c74bb71e update:redis兼容生产环境没有密码 2023-09-14 13:00:16 +08:00
chenbo
14dc6a1f36 update:君子签serviceurl配置文件 2023-09-14 12:58:08 +08:00
chenbo
d505aeffab update:商户合同列表公司名称 2023-09-14 12:08:16 +08:00
chenbo
b4959dc65c update:商户合同列表公司名称 2023-09-14 11:40:42 +08:00
chenbo
49d216778b update:商户合同列表公司名称 2023-09-14 11:39:48 +08:00
chenbo
c56d1ca88d Merge branch 'master-fix-0914' into dev
# Conflicts:
#	app/common/model/ShopContract.php
2023-09-14 11:18:58 +08:00
chenbo
68261ab9b1 update:商户合同列表公司名称 2023-09-14 11:18:09 +08:00
chenbo
907ae29aa0 update:商户资质同步 2023-09-14 11:12:23 +08:00
chenbo
de38de7138 add:其他任务详情接口,提交任务接口 2023-09-14 10:46:48 +08:00
chenbo
d131e34663 Merge remote-tracking branch 'origin/dev' into dev 2023-09-14 09:35:47 +08:00
chenbo
d9e18b5178 add:商户合同,甲方乙方 2023-09-14 09:35:33 +08:00
mkm
e544c5b702 Merge pull request 'mkm' (#21) from mkm into dev
Reviewed-on: #21
2023-09-14 09:21:16 +08:00
mkm
5c0e0d44e8 更新 2023-09-14 09:20:26 +08:00
mkm
aa3e30522b Merge pull request 'dev' (#20) from dev into master
Reviewed-on: #20
2023-09-13 22:56:32 +08:00
mkm
e1b8b9de6c Merge pull request '更新' (#19) from mkm into dev
Reviewed-on: #19
2023-09-13 22:33:34 +08:00
mkm
2a9eb09b68 更新 2023-09-13 22:31:53 +08:00
mkm
6736f61076 Merge pull request 'dev' (#18) from dev into master
Reviewed-on: #18
2023-09-13 22:04:24 +08:00
chenbo
91e218a0b1 add:evidence_shop_contract商户合同凭证文件夹 2023-09-13 21:54:32 +08:00
chenbo
194f619a69 add:商户认证反馈 2023-09-13 21:50:19 +08:00
chenbo
a2e35c34c9 add:商户认证反馈 2023-09-13 21:48:21 +08:00
chenbo
12b27bd026 add:商户认证反馈 2023-09-13 21:37:03 +08:00
chenbo
2024887a64 add:商户认证反馈 2023-09-13 21:32:32 +08:00
chenbo
97654424e6 add:商户认证反馈 2023-09-13 21:30:06 +08:00
chenbo
38a29b2ea3 add:商户认证反馈 2023-09-13 21:00:32 +08:00
chenbo
9d608716c6 add:商户认证反馈 2023-09-13 20:51:05 +08:00
chenbo
57b3271cf4 add:商户认证反馈 2023-09-13 20:44:08 +08:00
chenbo
a332288cac add:商户认证反馈 2023-09-13 20:29:33 +08:00
chenbo
d11b8ee00a add:商户认证反馈 2023-09-13 20:23:41 +08:00
chenbo
6e96d728ac add:商户合同发起签约 2023-09-13 20:14:04 +08:00
chenbo
7c3143fbb9 add:商户合同发起签约 2023-09-13 20:05:51 +08:00
chenbo
a15cd46512 add:商户合同发起签约 2023-09-13 19:45:15 +08:00
chenbo
223b7fc966 add:商户合同发起签约 2023-09-13 19:40:48 +08:00
chenbo
5205beca8b add:商户合同发起签约 2023-09-13 19:40:09 +08:00
chenbo
2dbac8253e add:商户合同发起签约 2023-09-13 19:24:04 +08:00
chenbo
f8256cca63 add:商户合同发起签约 2023-09-13 19:18:32 +08:00
chenbo
75a92c381e add:商户合同发起签约 2023-09-13 19:16:10 +08:00
chenbo
a156b5fed1 update:商户合同详情 2023-09-13 18:52:52 +08:00
chenbo
17789bf706 update:商户合同详情 2023-09-13 18:50:31 +08:00
chenbo
fe31a235a7 update:商户合同详情 2023-09-13 18:45:34 +08:00