chenbo
|
4339f45cb5
|
Merge branch 'master-fix-0915' into dev
# Conflicts:
# public/admin/index.html
|
2023-09-15 17:53:46 +08:00 |
|
chenbo
|
aa47142942
|
add:商城商户入驻认证，通滩镇商户要查询一下是否已通过企业认证，通过的情况下直接生成合同
|
2023-09-15 17:45:46 +08:00 |
|
chenbo
|
ee0ab0e013
|
add:其他任务提交创建审批，待审批列表
|
2023-09-15 17:00:52 +08:00 |
|
|
|
9866432e21
|
更新
|
2023-09-15 13:37:21 +08:00 |
|
chenbo
|
7e54616332
|
update:其他任务提交时创建审批
|
2023-09-15 13:37:15 +08:00 |
|
chenbo
|
602a9374ad
|
update:提交其他任务
|
2023-09-14 14:42:16 +08:00 |
|
chenbo
|
14dc6a1f36
|
update:君子签serviceurl配置文件
|
2023-09-14 12:58:08 +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
|
de38de7138
|
add:其他任务详情接口，提交任务接口
|
2023-09-14 10:46:48 +08:00 |
|
|
|
5c0e0d44e8
|
更新
|
2023-09-14 09:20:26 +08:00 |
|
|
|
aa3e30522b
|
Merge pull request 'dev' (#20) from dev into master
Reviewed-on: #20
|
2023-09-13 22:56:32 +08:00 |
|
|
|
e1b8b9de6c
|
Merge pull request '更新' (#19) from mkm into dev
Reviewed-on: #19
|
2023-09-13 22:33:34 +08:00 |
|
|
|
2a9eb09b68
|
更新
|
2023-09-13 22:31:53 +08:00 |
|
|
|
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
|
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
|
a332288cac
|
add:商户认证反馈
|
2023-09-13 20:29:33 +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
|
5205beca8b
|
add:商户合同发起签约
|
2023-09-13 19:40:09 +08:00 |
|
chenbo
|
75a92c381e
|
add:商户合同发起签约
|
2023-09-13 19:16:10 +08:00 |
|
chenbo
|
87f3ff0ba8
|
add:商户合同管理
|
2023-09-13 17:48:44 +08:00 |
|
chenbo
|
c5a8698d0c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-13 15:54:27 +08:00 |
|
chenbo
|
b9333d51ba
|
add:商城商户入驻逻辑
|
2023-09-13 15:54:15 +08:00 |
|
|
|
b9bbf94b27
|
Merge pull request '修改' (#16) from mkm into dev
Reviewed-on: #16
|
2023-09-13 15:11:00 +08:00 |
|
shengchanzhe
|
40d98b8e44
|
修改
|
2023-09-13 15:09:33 +08:00 |
|
|
|
ae42f44967
|
Merge pull request '更新' (#14) from mkm into dev
Reviewed-on: #14
|
2023-09-13 14:31:17 +08:00 |
|
shengchanzhe
|
8d3eb6d833
|
更新
|
2023-09-13 14:29:48 +08:00 |
|
|
|
3251bb6983
|
Merge pull request '展示设置' (#13) from mkm into dev
Reviewed-on: #13
|
2023-09-13 14:16:58 +08:00 |
|
shengchanzhe
|
d77fbaf6fa
|
展示设置
|
2023-09-13 14:15:19 +08:00 |
|
|
|
4bbd5be1b4
|
Merge pull request '优化' (#11) from mkm into dev
Reviewed-on: #11
|
2023-09-12 17:01:38 +08:00 |
|
|
|
a3032f03f4
|
优化
|
2023-09-12 16:56:36 +08:00 |
|
|
|
8ce2fb0889
|
Merge pull request '更新' (#10) from mkm into dev
Reviewed-on: #10
|
2023-09-12 16:45:40 +08:00 |
|
|
|
703653e25b
|
更新
|
2023-09-12 16:44:15 +08:00 |
|
|
|
7ce531db7e
|
Merge pull request '修复错误' (#9) from mkm into dev
Reviewed-on: #9
|
2023-09-12 15:28:51 +08:00 |
|
|
|
cef843725e
|
修复错误
|
2023-09-12 15:27:11 +08:00 |
|
|
|
1e6c67cca0
|
Merge pull request 'mkm' (#8) from mkm into dev
Reviewed-on: #8
|
2023-09-12 15:25:18 +08:00 |
|
|
|
5140a4adc4
|
更新
|
2023-09-12 15:22:32 +08:00 |
|
|
|
9dccfd0bf5
|
讯飞更新
|
2023-09-12 15:20:31 +08:00 |
|
|
|
6719a523bc
|
Merge pull request '讯飞' (#6) from mkm into dev
Reviewed-on: #6
|
2023-09-12 12:38:57 +08:00 |
|
|
|
b905b58053
|
讯飞
|
2023-09-12 12:36:32 +08:00 |
|
|
|
3268502446
|
更新 app/api/logic/LoginLogic.php
修复支付问题
|
2023-09-11 23:25:21 +08:00 |
|
chenbo
|
1fbcb7cbcf
|
Merge branch 'feature' into dev
|
2023-09-11 13:52:59 +08:00 |
|
chenbo
|
e8b81e406c
|
update:平台公司不做任务安排和生成合同，平台公司企业认证成功后自动更新签约状态为已签约
|
2023-09-11 13:52:29 +08:00 |
|
|
|
40cb7c179f
|
Merge pull request '修复错误' (#3) from mkm into dev
Reviewed-on: #3
|
2023-09-11 13:45:18 +08:00 |
|
