611 Commits

Author SHA1 Message Date
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
mkm
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
mkm
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
mkm
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
mkm
4bbd5be1b4 Merge pull request '优化' (#11) from mkm into dev
Reviewed-on: #11
2023-09-12 17:01:38 +08:00
mkm
a3032f03f4 优化 2023-09-12 16:56:36 +08:00
mkm
8ce2fb0889 Merge pull request '更新' (#10) from mkm into dev
Reviewed-on: #10
2023-09-12 16:45:40 +08:00
mkm
703653e25b 更新 2023-09-12 16:44:15 +08:00
mkm
7ce531db7e Merge pull request '修复错误' (#9) from mkm into dev
Reviewed-on: #9
2023-09-12 15:28:51 +08:00
mkm
cef843725e 修复错误 2023-09-12 15:27:11 +08:00
mkm
1e6c67cca0 Merge pull request 'mkm' (#8) from mkm into dev
Reviewed-on: #8
2023-09-12 15:25:18 +08:00
mkm
5140a4adc4 更新 2023-09-12 15:22:32 +08:00
mkm
9dccfd0bf5 讯飞更新 2023-09-12 15:20:31 +08:00
mkm
6719a523bc Merge pull request '讯飞' (#6) from mkm into dev
Reviewed-on: #6
2023-09-12 12:38:57 +08:00
mkm
b905b58053 讯飞 2023-09-12 12:36:32 +08:00
mkm
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
mkm
40cb7c179f Merge pull request '修复错误' (#3) from mkm into dev
Reviewed-on: #3
2023-09-11 13:45:18 +08:00
mkm
c4b518e85e 修复错误 2023-09-11 13:42:32 +08:00
mkm
fb30dd0be3 Merge pull request '更新' (#2) from mkm into dev
Reviewed-on: #2
2023-09-11 13:35:26 +08:00
mkm
e808faa9c5 更新 2023-09-11 12:15:18 +08:00
chenbo
2a9b4dedd7 Merge remote-tracking branch 'origin/dev' into dev 2023-09-11 11:58:37 +08:00
chenbo
f4806e696a update:后台申请提现列表接口 2023-09-11 11:58:26 +08:00
mkm
2aa7fb47fd Merge pull request 'mkm' (#1) from mkm into dev
Reviewed-on: #1
2023-09-11 11:56:22 +08:00
mkm
a03b29f00e Merge branch 'mkm' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm 2023-09-11 11:34:36 +08:00
mkm
18109bdb45 更新 2023-09-11 11:34:34 +08:00
chenbo
ae32006a6e update 2023-09-11 10:27:13 +08:00
chenbo
a21b8f5471 Merge remote-tracking branch 'origin/dev' into dev 2023-09-11 09:48:28 +08:00
chenbo
e56acef076 update 2023-09-11 09:47:21 +08:00
mkm
d67775625c Merge pull request '更新' (#55) from mkm into dev
Reviewed-on: #55
2023-09-09 22:02:12 +08:00
shengchanzhe
2c95c0b8e3 更新 2023-09-09 22:00:39 +08:00
unknown
25228c773f update notify 2023-09-09 20:29:10 +08:00
unknown
b53cb00c05 update notify 2023-09-09 20:15:50 +08:00
chenbo
deb4b80b74 Merge remote-tracking branch 'origin/dev' into dev 2023-09-09 20:00:03 +08:00
chenbo
ce599e76a4 update:公司提现改造,app端新增用户当前可提现金额接口,后台新增提现审核接口,根据周期内可提现金额做扣除公司金额和用户金额。 2023-09-09 19:59:50 +08:00
unknown
5ed3fa839e 修复三轮车发送合同回调 2023-09-09 18:58:57 +08:00
unknown
812c27f721 修复三轮车发送合同回调 2023-09-09 14:58:56 +08:00
unknown
7d13753dd9 patch 2023-09-09 14:35:02 +08:00
unknown
815b1a3b4b update 2023-09-09 14:19:07 +08:00
unknown
d978c41284 update 2023-09-09 13:47:32 +08:00