unknown
|
29d0715d80
|
update
|
2023-10-18 11:16:12 +08:00 |
|
weiz
|
f68298958c
|
Merge pull request 'update' (#108) from zhangwei into dev
Reviewed-on: #108
|
2023-10-18 10:52:04 +08:00 |
|
unknown
|
cee7b56ab0
|
update
|
2023-10-18 10:51:46 +08:00 |
|
chenbo
|
aa0e5c9ae6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-18 10:43:07 +08:00 |
|
chenbo
|
cb6c7730a8
|
add:任务10的前台逻辑
|
2023-10-18 10:42:58 +08:00 |
|
weiz
|
7f5a326a85
|
Merge pull request 'update' (#107) from zhangwei into dev
Reviewed-on: #107
|
2023-10-18 10:38:49 +08:00 |
|
unknown
|
20555862b6
|
update
|
2023-10-18 10:38:19 +08:00 |
|
chenbo
|
b08274f2f7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-18 10:32:00 +08:00 |
|
chenbo
|
74ff44a8ad
|
add:前端代码更新
|
2023-10-18 10:31:50 +08:00 |
|
chenbo
|
fb027ce16f
|
Merge remote-tracking branch 'origin/master-yajin-feature' into master-yajin-feature
|
2023-10-18 10:26:47 +08:00 |
|
chenbo
|
52b4ea0d4d
|
被冲掉代码
|
2023-10-18 10:26:34 +08:00 |
|
weiz
|
c1908d8178
|
Merge pull request '修复租赁详情页bug' (#104) from zhangwei into dev
Reviewed-on: #104
|
2023-10-18 10:16:47 +08:00 |
|
unknown
|
1f468b61d2
|
修复租赁详情页bug
|
2023-10-18 10:16:16 +08:00 |
|
chenbo
|
02480accf4
|
Merge branch 'master' into master-yajin-feature
|
2023-10-18 10:16:07 +08:00 |
|
chenbo
|
a028545068
|
前端代码
|
2023-10-18 10:15:30 +08:00 |
|
chenbo
|
a3d4ba5251
|
Merge pull request 'master-yajin-feature' (#102) from master-yajin-feature into master
Reviewed-on: #102
|
2023-10-18 10:03:41 +08:00 |
|
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 |
|
chenbo
|
0270ac8f9d
|
revert f37e5b3ec29b10e910f19ac78e858efe57d4cf85
revert 押金充值对公账号转账临时方案-前端代码
|
2023-10-18 09:59:48 +08:00 |
|
weiz
|
108a8f36f2
|
Merge pull request '合同详情中租赁车俩签约时间显示错误修复' (#100) from zhangwei into dev
Reviewed-on: #100
|
2023-10-18 09:43:45 +08:00 |
|
unknown
|
f1a6d17923
|
合同详情中租赁车俩签约时间显示错误修复
|
2023-10-18 09:43:18 +08:00 |
|
weiz
|
c31b4ad335
|
Merge pull request '修复购买合同车辆数量异常' (#99) from zhangwei into dev
Reviewed-on: #99
|
2023-10-18 09:37:49 +08:00 |
|
unknown
|
414f6435ca
|
修复购买合同车辆数量异常
|
2023-10-18 09:37:11 +08:00 |
|
chenbo
|
f37e5b3ec2
|
押金充值对公账号转账临时方案-前端代码
|
2023-10-18 09:05:37 +08:00 |
|
weiz
|
45624625f4
|
Merge pull request 'fixed' (#98) from zhangwei into dev
Reviewed-on: #98
|
2023-10-17 19:38:35 +08:00 |
|
unknown
|
217c0166cd
|
fixed
|
2023-10-17 19:38:14 +08:00 |
|
weiz
|
9fb8a0e279
|
Merge pull request 'fixed' (#97) from zhangwei into dev
Reviewed-on: #97
|
2023-10-17 19:24:24 +08:00 |
|
unknown
|
b580c85738
|
fixed
|
2023-10-17 19:24:01 +08:00 |
|
|
|
67b5ac329d
|
Merge pull request 'preview' (#96) from preview into master
Reviewed-on: #96
|
2023-10-17 19:10:39 +08:00 |
|
|
|
fe0a390e0e
|
Merge pull request 'dev' (#95) from dev into preview
Reviewed-on: #95
|
2023-10-17 19:10:13 +08:00 |
|
weiz
|
5e6efdcf1d
|
Merge pull request 'fixed' (#94) from zhangwei into dev
Reviewed-on: #94
|
2023-10-17 19:00:36 +08:00 |
|
unknown
|
1b5e2e9e7b
|
fixed
|
2023-10-17 19:00:04 +08:00 |
|
weiz
|
27a10d9de9
|
Merge pull request '租赁详情传值修复' (#93) from zhangwei into dev
Reviewed-on: #93
|
2023-10-17 18:00:29 +08:00 |
|
unknown
|
87b5fbacd9
|
租赁详情传值修复
|
2023-10-17 18:00:03 +08:00 |
|
weiz
|
4e018e1ecc
|
Merge pull request '租赁详情传值修复' (#92) from zhangwei into dev
Reviewed-on: #92
|
2023-10-17 17:56:37 +08:00 |
|
unknown
|
038a1fc148
|
租赁详情传值修复
|
2023-10-17 17:56:15 +08:00 |
|
weiz
|
836accce57
|
Merge pull request '租赁详情传值修复' (#91) from zhangwei into dev
Reviewed-on: #91
|
2023-10-17 17:53:13 +08:00 |
|
unknown
|
91dc1b31c3
|
租赁详情传值修复
|
2023-10-17 17:52:46 +08:00 |
|
weiz
|
db171e997d
|
Merge pull request '镇公司与平台签约的租赁合同列表bug修复' (#90) from zhangwei into dev
Reviewed-on: #90
|
2023-10-17 17:24:25 +08:00 |
|
unknown
|
802b3a91a9
|
镇公司与平台签约的租赁合同列表bug修复
|
2023-10-17 17:23:49 +08:00 |
|
chenbo
|
9dcf86558a
|
fixed:公司余额字段
|
2023-10-17 17:12:38 +08:00 |
|
chenbo
|
dd3ca501d8
|
add:押金充值对公账户临时方案-前端代码
|
2023-10-17 16:16:07 +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
|
14b98eefd5
|
新增阿里云视频直播接口
|
2023-10-16 19:30:11 +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
|
a1c67b2dd1
|
更新商机列表及详情
|
2023-10-16 15:01:11 +08:00 |
|
