867 Commits

Author SHA1 Message Date
unknown
6c3915f606 patch 2023-09-07 14:12:58 +08:00
weiz
64c6dcf868 Merge pull request 'patch' (#19) from zhangwei into dev
Reviewed-on: #19
2023-09-07 14:07:14 +08:00
unknown
09a30c0b5f patch 2023-09-07 14:06:42 +08:00
weiz
f112d64468 Merge pull request '上传自有车辆图片' (#18) from zhangwei into dev
Reviewed-on: #18
2023-09-07 13:40:51 +08:00
unknown
50228d0968 上传自有车辆图片 2023-09-07 13:39:28 +08:00
weiz
d8c32c0467 Merge pull request 'patch' (#17) from zhangwei into dev
Reviewed-on: #17
2023-09-07 10:44:43 +08:00
unknown
9ecbaf6339 patch 2023-09-07 10:44:14 +08:00
weiz
e4cffb8455 Merge pull request 'master' (#16) from master into dev
Reviewed-on: #16
2023-09-07 10:41:03 +08:00
weiz
11e35dd1f1 Merge pull request '修改租赁车辆选择功能3' (#15) from zhangwei into master
Reviewed-on: #15
2023-09-07 10:24:50 +08:00
unknown
b1a3827ba8 修改租赁车辆选择功能3 2023-09-07 10:24:13 +08:00
weiz
b2c9fff1f1 Merge pull request '修改租赁车辆选择功能2' (#14) from zhangwei into master
Reviewed-on: #14
2023-09-07 10:09:44 +08:00
unknown
77c8ed63dd 修改租赁车辆选择功能2 2023-09-07 10:09:11 +08:00
mkm
4bd5427158 更新小队 和 结算的types3的屏蔽 2023-09-07 10:05:30 +08:00
chenbo
6e8408a490 Merge branch 'chenbo_dev' into dev 2023-09-07 09:47:38 +08:00
chenbo
ce3c0ce52f add:1.生成合同,甲方公司不是平台公司时,需要满足与平台公司或上级公司签过合同才能签约。2.带上签约时的验证方式为人脸识别及其阈值。3.添加或编辑公司时,主联系人手机号不能重复使用 2023-09-07 09:46:54 +08:00
weiz
8931b074de Merge pull request '修改租赁车辆选择功能' (#13) from zhangwei into master
Reviewed-on: #13
2023-09-07 09:43:25 +08:00
unknown
0a11fef3d8 修改租赁车辆选择功能 2023-09-07 09:41:53 +08:00
chenbo
becb8c8386 注释 2023-09-06 14:49:01 +08:00
chenbo
b8a04841f9 注释 2023-09-06 14:48:03 +08:00
chenbo
69eb834d95 注释 2023-09-06 14:46:33 +08:00
chenbo
51d4b4c9a2 注释 2023-09-06 14:27:11 +08:00
chenbo
fec7a7f2c6 Merge remote-tracking branch 'origin/master' 2023-09-06 13:51:29 +08:00
chenbo
47d5802d89 add:合同详情接口新增字段:已签约合同地址 2023-09-06 13:51:01 +08:00
mkm
0295ec0ec3 更新 2023-09-06 11:44:43 +08:00
chenbo
96d2cd23be update:生成合同时,校验甲方公司是否有过签约 2023-09-06 11:01:26 +08:00
chenbo
2365a4ce5c Merge remote-tracking branch 'origin/master' 2023-09-06 10:36:46 +08:00
chenbo
62faa8ee76 update:生成合同时,校验甲方公司是否有过签约 2023-09-06 10:36:26 +08:00
mkm
349403507d Merge branch 'master' of https://gitea.lihaink.cn/mkm/TaskSystem 2023-09-06 10:04:22 +08:00
mkm
942613d0cf 修复报错 2023-09-06 10:04:21 +08:00
weiz
3c80dcad81 Merge pull request '新增镇街合同列表,发起合同,重发短信接口' (#12) from zhangwei into master
Reviewed-on: #12
2023-09-06 09:50:08 +08:00
unknown
8f47f0fc11 新增镇街合同列表,发起合同,重发短信接口 2023-09-06 09:49:18 +08:00
mkm
e095e297ec 修复错误 2023-09-06 09:36:41 +08:00
weiz
8a15d58f90 Merge pull request 'update' (#11) from zhangwei into master
Reviewed-on: #11
2023-09-05 17:47:05 +08:00
unknown
7304ec1e3f update 2023-09-05 17:46:03 +08:00
weiz
77198f43bb Merge pull request 'update' (#10) from zhangwei into master
Reviewed-on: #10
2023-09-05 17:31:12 +08:00
unknown
51e27ba429 update 2023-09-05 17:30:53 +08:00
mkm
59ceb976f6 修复编辑的错误 2023-09-05 17:05:53 +08:00
weiz
5209382fd4 Merge pull request 'update' (#9) from zhangwei into master
Reviewed-on: #9
2023-09-05 17:03:34 +08:00
unknown
62ddcd3611 update 2023-09-05 17:00:23 +08:00
weiz
0f84515d55 Merge pull request 'update' (#8) from zhangwei into master
Reviewed-on: #8
2023-09-05 16:53:04 +08:00
unknown
606802c0be update 2023-09-05 16:51:57 +08:00
mkm
211d8cba73 更新pc页面 2023-09-05 16:39:15 +08:00
mkm
733a9527b1 更新 2023-09-05 16:34:14 +08:00
mkm
48abd16af8 修复错误 2023-09-05 15:52:55 +08:00
mkm
07bccac83b 更新任务结算和下发 2023-09-05 15:52:01 +08:00
weiz
9398bf0843 Merge pull request 'update' (#7) from zhangwei into master
Reviewed-on: #7
2023-09-05 15:06:45 +08:00
unknown
6196c10e56 update 2023-09-05 15:04:58 +08:00
chenbo
79ac7be63f Merge pull request 'chenbo_dev_0904' (#6) from chenbo_dev_0904 into master
Reviewed-on: #6
2023-09-05 14:24:32 +08:00
chenbo
d7981fdd94 Merge branch 'master' into chenbo_dev_0904 2023-09-05 14:20:27 +08:00
mkm
73166302b7 修复问题 2023-09-05 14:08:11 +08:00