648 Commits

Author SHA1 Message Date
chenbo
fa242a8492 Merge branch 'master' into master-yajin-feature
# Conflicts:
#	app/common/logic/CompanyLogic.php
#	public/admin/index.html
2023-10-18 10:02:11 +08:00
unknown
1b5e2e9e7b fixed 2023-10-17 19:00:04 +08:00
unknown
87b5fbacd9 租赁详情传值修复 2023-10-17 18:00:03 +08:00
unknown
038a1fc148 租赁详情传值修复 2023-10-17 17:56:15 +08:00
unknown
91dc1b31c3 租赁详情传值修复 2023-10-17 17:52:46 +08:00
unknown
802b3a91a9 镇公司与平台签约的租赁合同列表bug修复 2023-10-17 17:23:49 +08:00
chenbo
9c2aa1b1ca add:押金充值对公账户临时方案 2023-10-17 15:34:20 +08:00
chenbo
eb5607bfe4 add:押金充值对公账户临时方案 2023-10-17 14:14:45 +08:00
yaooo
df3345c559 更新阿里云视频直播接口 2023-10-17 10:24:59 +08:00
yaooo
a33f154b31 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-10-16 19:30:19 +08:00
yaooo
7824b551f7 新增阿里云视频直播接口 2023-10-16 19:28:42 +08:00
chenbo
14de92e0e1 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 18:28:24 +08:00
chenbo
9309985982 add:市场部长任务下发和结算 2023-10-16 18:28:05 +08:00
yaooo
93ef4ca713 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-10-16 14:10:09 +08:00
yaooo
efb2f2a8e3 更新商机列表及详情 2023-10-16 14:09:55 +08:00
unknown
df77185f6c 可在租车辆取值为负数修复 2023-10-16 13:34:27 +08:00
weiz
96559416e3 Merge pull request 'fixed buycar' (#88) from zhangwei into dev
Reviewed-on: #88
2023-10-16 13:30:49 +08:00
yaooo
b69fc141d1 新增用户查询AI商机列表接口 2023-10-16 11:30:57 +08:00
yaooo
e3bdf99015 更新星火认知模型聊天 2023-10-14 16:47:25 +08:00
yaooo
36d86f82e2 更新星火认知模型聊天 2023-10-14 15:55:48 +08:00
yaooo
bd77a97d2f 更新星火认知模型聊天 2023-10-14 15:32:48 +08:00
yaooo
fe9eb7cb41 更新星火认知模型聊天 2023-10-14 11:56:12 +08:00
unknown
8c4b9f7bd2 fixed buycar 2023-10-14 09:56:30 +08:00
chenbo
f5f28988e5 add:1.商户入驻审批通过时,记录通过时间作为商户入驻时间。shop_merchant_settle_log 2.市场部长任务1,2,3判定和结算 2023-10-13 18:19:23 +08:00
chenbo
22ed2105fb add:押金充值线上转账对公账户临时方案 2023-10-13 18:16:37 +08:00
unknown
98f0995b7e 车辆购买done2 2023-10-13 17:06:27 +08:00
unknown
6bd04e5c2a 车辆购买done 2023-10-13 16:51:49 +08:00
unknown
e5c2e25ece fiexd 2023-10-13 15:44:05 +08:00
unknown
389a6d1243 车辆购买回调 2023-10-13 14:49:41 +08:00
unknown
7a8533595a 修改小组公司租赁签约回调 2023-10-13 14:03:01 +08:00
unknown
6bd6a89680 fixed 2023-10-13 13:49:10 +08:00
chenbo
8a7b59ecff fix:app任务列表接口和充值记录列表接口 2023-10-13 11:57:44 +08:00
chenbo
1bf17d0eba fixed:App端任务列表接口和充值记录列表接口 2023-10-13 11:51:44 +08:00
unknown
ae7499bd05 修复上传合同bug 2023-10-13 10:12:16 +08:00
unknown
04a155c98c 小组公司详情页逻辑修改 2023-10-12 17:53:40 +08:00
unknown
39ddbe0dd6 小组公司详情页逻辑修改 2023-10-12 17:45:59 +08:00
unknown
138d04a7da 小组公司详情页逻辑修改 2023-10-12 17:33:47 +08:00
unknown
55e943166e 三轮车购买镇街公司空余车辆 2023-10-12 16:31:15 +08:00
unknown
27fca62641 buy cars part3 2023-10-12 13:56:06 +08:00
yaooo
8c96e517f8 更新发音人 2023-10-12 11:20:48 +08:00
yaooo
f26780470a 更新iat语音临时 2023-10-11 18:45:24 +08:00
yaooo
f0b853ebe9 更新iat语音临时 2023-10-11 18:43:01 +08:00
yaooo
422e84abb6 更新iat语音临时 2023-10-11 18:42:09 +08:00
yaooo
21d166ab19 更新iat语音 2023-10-11 18:31:08 +08:00
yaooo
ad8d0f78c8 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-10-11 18:22:14 +08:00
yaooo
60c4201dad 更新iat语音 2023-10-11 18:21:52 +08:00
unknown
9ab7137a2d 三轮车购买part2 2023-10-11 18:00:03 +08:00
unknown
d309ad16dc 三轮车购买part2 2023-10-11 17:41:03 +08:00
yaooo
68c1c3be99 更新iat语音 2023-10-11 17:37:13 +08:00
yaooo
89ead4d9e8 更新iat语音 2023-10-11 17:29:52 +08:00