 马三炮
|
6e29cea504
|
二级页面
|
2025-03-18 18:12:17 +08:00 |
|
马三炮
|
62bad35573
|
二级页面
|
2025-03-18 13:14:38 +08:00 |
 mashuai
|
56ce9e8f12
|
大屏二级页面
|
2025-03-18 12:18:22 +08:00 |
|
mashuai
|
266bd0f4ce
|
大屏
|
2025-03-18 10:59:58 +08:00 |
|
mashuai
|
ae452f8598
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-03-17 18:32:42 +08:00 |
|
马三炮
|
384287db5c
|
需求通知
|
2025-03-17 18:12:21 +08:00 |
|
mashuai
|
0e3276f618
|
11
|
2025-03-17 18:11:07 +08:00 |
|
mashuai
|
ba6b3496d5
|
优化
|
2025-03-17 15:21:18 +08:00 |
|
mashuai
|
69938dc39f
|
大屏
|
2025-03-17 13:06:03 +08:00 |
|
马三炮
|
b63bde9f57
|
问题修复
|
2025-03-14 17:50:26 +08:00 |
|
mashuai
|
ef8fd59d8b
|
大屏
|
2025-03-14 17:24:25 +08:00 |
|
mashuai
|
4ea5a3686e
|
大屏
|
2025-03-12 17:42:45 +08:00 |
|
mashuai
|
92f51eb9c0
|
通知公告
|
2025-03-12 14:52:48 +08:00 |
|
mashuai
|
f2e39fd91a
|
优化
|
2025-03-11 16:23:51 +08:00 |
|
mashuai
|
a87afeef23
|
优化
|
2025-03-11 15:05:03 +08:00 |
 hongchao
|
fddfd688a7
|
bug 修复
|
2025-03-10 16:57:28 +08:00 |
syruan
|
a8a64cc426
|
新增企业专区接口，合同修改
|
2025-02-28 13:30:24 +08:00 |
|
mashuai
|
6f3f7d9c32
|
功能需求优化
|
2025-02-26 14:59:21 +08:00 |
|
syruan
|
7cd842073e
|
订单短信发送1
|
2025-02-25 17:10:55 +08:00 |
|
mashuai
|
50b984ba3b
|
功能需求优化
|
2025-02-25 16:50:16 +08:00 |
|
syruan
|
94c04684dc
|
订单短信发送
|
2025-02-25 13:54:46 +08:00 |
|
mashuai
|
ff2d52126e
|
功能需求优化
|
2025-02-24 17:59:31 +08:00 |
|
mashuai
|
f2b250e0b1
|
功能需求优化
|
2025-02-24 16:36:11 +08:00 |
|
syruan
|
21f8103961
|
优化问题
|
2025-02-24 15:49:21 +08:00 |
 liang.chao
|
3827dad74a
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
# bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
|
2025-02-21 18:44:19 +08:00 |
|
liang.chao
|
15515e28ee
|
合同协议功能开发
|
2025-02-21 18:43:12 +08:00 |
 haozq
|
a299791d26
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
# bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
|
2025-02-21 17:26:33 +08:00 |
|
haozq
|
bab5c75074
|
订单号查询
|
2025-02-21 17:26:07 +08:00 |
|
mashuai
|
e44616fc3f
|
功能需求优化
|
2025-02-21 17:16:55 +08:00 |
 bonus
|
f6bbc9d2f5
|
消息未读数开发
|
2025-02-14 09:24:40 +08:00 |
 sxu
|
7f1e6de5f0
|
Merge branch 'master' into ah-simple
|
2025-01-23 10:16:41 +08:00 |
|
sxu
|
37caac54fc
|
代办优化
|
2025-01-23 10:15:35 +08:00 |
|
sxu
|
65afc2269d
|
Merge branch 'master' into ah-simple
|
2025-01-23 10:01:27 +08:00 |
|
sxu
|
dc217d8ac4
|
代办优化
|
2025-01-22 15:03:52 +08:00 |
|
sxu
|
6391be0117
|
Revert "代办优化"
This reverts commit e4f42a6456.
|
2025-01-22 13:53:39 +08:00 |
|
sxu
|
e4f42a6456
|
代办优化
|
2025-01-22 09:57:13 +08:00 |
|
sxu
|
115de905e5
|
代办优化
|
2025-01-22 09:46:05 +08:00 |
|
liang.chao
|
670411c42d
|
消息已读功能修改
|
2025-01-21 18:26:50 +08:00 |
|
sxu
|
851297436b
|
Merge branch 'master' into ah-simple
|
2025-01-15 09:24:11 +08:00 |
|
sxu
|
40e5c73bcd
|
slideshow
|
2025-01-15 09:20:24 +08:00 |
|
sxu
|
fa3a396d90
|
安徽简化版
|
2025-01-10 10:18:11 +08:00 |
|
sxu
|
ff0a813807
|
大屏bug
|
2025-01-07 19:04:01 +08:00 |
|
sxu
|
e1df8bf961
|
大屏bug
|
2025-01-07 18:10:59 +08:00 |
|
sxu
|
44f5f0c510
|
大屏bug
|
2025-01-07 17:48:26 +08:00 |
|
sxu
|
93996d1853
|
大屏bug
|
2025-01-07 17:40:32 +08:00 |
|
sxu
|
11534b3436
|
大屏bug
|
2025-01-07 16:04:59 +08:00 |
|
sxu
|
350150ac89
|
大屏bug
|
2025-01-07 15:41:05 +08:00 |
|
sxu
|
a80aae8836
|
大屏：出租装备分析
|
2025-01-07 14:45:22 +08:00 |
|
sxu
|
a94d150c5a
|
大屏：租赁需求分析
|
2025-01-07 14:30:52 +08:00 |
|
sxu
|
9fa708625b
|
大屏：装备共享排名
|
2025-01-07 13:29:22 +08:00 |
|
sxu
|
16efe3dbac
|
大屏：装备租赁互联
|
2025-01-06 17:59:37 +08:00 |
|
sxu
|
b517031534
|
大屏：出租装备分析
|
2025-01-06 17:15:39 +08:00 |
|
sxu
|
c7dde73e4f
|
大屏：闲置装备分析
|
2025-01-06 16:30:17 +08:00 |
|
sxu
|
8ce8e73ed3
|
需求详情
|
2025-01-02 18:08:33 +08:00 |
|
sxu
|
27b5de0b91
|
需求详情
|
2025-01-02 17:41:51 +08:00 |
|
sxu
|
3ed2059cde
|
订单消息
|
2025-01-02 15:44:46 +08:00 |
|
sxu
|
2b548896f0
|
大屏装备利用率计算
|
2025-01-02 14:30:31 +08:00 |
|
sxu
|
cdb8193a75
|
装备上架按类型统计
|
2024-12-31 15:03:11 +08:00 |
|
sxu
|
2a15873c62
|
装备需求统计
|
2024-12-31 14:29:25 +08:00 |
|
sxu
|
cde70380a4
|
装备租赁统计
|
2024-12-31 13:35:51 +08:00 |
|
sxu
|
f2e848c0e4
|
装备租赁统计
|
2024-12-31 13:20:07 +08:00 |
|
sxu
|
9b007d4a0a
|
装备上架统计
|
2024-12-31 11:15:57 +08:00 |
|
sxu
|
9db2dd3c55
|
装备总数和上架总数
|
2024-12-31 10:21:35 +08:00 |
|
sxu
|
29b7988f83
|
搜索
|
2024-12-30 17:45:11 +08:00 |
|
liang.chao
|
71634e3ca3
|
快捷回复查询bug修改
|
2024-12-30 17:19:26 +08:00 |
|
sxu
|
c8db2df18c
|
Merge remote-tracking branch 'origin/master'
|
2024-12-27 18:59:24 +08:00 |
|
liang.chao
|
f72c6fc29d
|
安全证书查询bug修改
|
2024-12-27 16:16:43 +08:00 |
|
liang.chao
|
7cc2b1410c
|
相关功能优化
|
2024-12-27 15:38:14 +08:00 |
|
sxu
|
f30e571a10
|
todolist get order by code
|
2024-12-27 14:48:04 +08:00 |
|
sxu
|
44352c5b68
|
todolist taskStatus
|
2024-12-27 13:55:03 +08:00 |
|
sxu
|
a521cf21a3
|
Merge remote-tracking branch 'origin/master'
|
2024-12-27 13:53:26 +08:00 |
|
sxu
|
ea37a7df12
|
统计订单数，按角色
|
2024-12-27 13:51:46 +08:00 |
|
liang.chao
|
0352bc784c
|
装备详情质检证书取最新质检报告
|
2024-12-27 10:13:50 +08:00 |
|
sxu
|
ab69f00a80
|
Merge remote-tracking branch 'origin/master'
|
2024-12-26 18:11:28 +08:00 |
|
liang.chao
|
b9721cf32b
|
安全证书质检管理 维修保养、接单、审核、驳回发送消息
|
2024-12-26 18:09:29 +08:00 |
|
sxu
|
e6ae06d412
|
购物车批量删除
|
2024-12-26 18:09:09 +08:00 |
|
liang.chao
|
95de8db2da
|
消息管理流程逻辑修复 装备质检以及接单存放消息功能
|
2024-12-26 10:36:27 +08:00 |
|
sxu
|
f275562dc0
|
待办
|
2024-12-25 15:27:45 +08:00 |
|
sxu
|
de8c05fef4
|
待办
|
2024-12-25 15:21:26 +08:00 |
|
sxu
|
6b876c137f
|
待办
|
2024-12-25 14:44:47 +08:00 |
|
sxu
|
9a0b35ce96
|
待办
|
2024-12-25 14:41:57 +08:00 |
|
sxu
|
a7d37d89df
|
待办
|
2024-12-25 14:33:29 +08:00 |
|
sxu
|
34ee953d7e
|
待办
|
2024-12-25 13:58:09 +08:00 |
|
sxu
|
416fc2bf6c
|
待办
|
2024-12-25 13:42:04 +08:00 |
|
sxu
|
6e26b144ff
|
待办
|
2024-12-25 13:26:35 +08:00 |
|
sxu
|
a9ca59b733
|
待办
|
2024-12-25 12:08:57 +08:00 |
|
liang.chao
|
ae9d118c49
|
消息管理联调以及大屏接口开发
|
2024-12-24 17:55:55 +08:00 |
|
sxu
|
179ddfa584
|
fix conflict
|
2024-12-23 18:41:25 +08:00 |
|
sxu
|
aaa5105fb1
|
消息
|
2024-12-23 18:40:08 +08:00 |
|
liang.chao
|
9fe6348c4e
|
消息管理
|
2024-12-23 18:39:40 +08:00 |
|
liang.chao
|
0f127d5b6a
|
消息管理
|
2024-12-23 17:04:21 +08:00 |
|
liang.chao
|
9dce8c3b3d
|
消息管理
|
2024-12-23 13:33:27 +08:00 |
|
sxu
|
73e4f593fe
|
消息
|
2024-12-23 11:07:09 +08:00 |
|
liang.chao
|
48d9ebf531
|
装备质检记录bug修改
|
2024-12-23 11:03:22 +08:00 |
|
liang.chao
|
63ec64e82a
|
装备列表返回质检周期
|
2024-12-23 10:15:42 +08:00 |
|
liang.chao
|
3821004d0e
|
详情增加检测记录图片
|
2024-12-23 10:07:37 +08:00 |
|
liang.chao
|
605d43b75d
|
消息通知
|
2024-12-20 20:19:28 +08:00 |
|
liang.chao
|
a67e45e240
|
返回预警天数
|
2024-12-20 19:46:54 +08:00 |
|
liang.chao
|
af018df883
|
消息通知
|
2024-12-20 19:45:24 +08:00 |
|
liang.chao
|
accc93b0a6
|
装备编辑回显装备证书
|
2024-12-20 19:29:47 +08:00 |
|
liang.chao
|
a6c5364801
|
装备编辑回显装备证书
|
2024-12-20 19:27:27 +08:00 |
|
liang.chao
|
c8dada1e67
|
装备编辑回显装备证书
|
2024-12-20 18:50:16 +08:00 |
|
liang.chao
|
814f82ba1a
|
装备编辑回显装备证书
|
2024-12-20 18:38:45 +08:00 |
|
liang.chao
|
18569b3b13
|
装备编辑回显装备证书
|
2024-12-20 17:56:14 +08:00 |
|
liang.chao
|
d5986d572a
|
详情页增加检测记录
|
2024-12-20 17:15:04 +08:00 |
|
liang.chao
|
6e87427cfa
|
详情页增加检测记录
|
2024-12-20 16:06:27 +08:00 |
|
liang.chao
|
9b2342d295
|
Merge remote-tracking branch 'origin/master'
|
2024-12-20 15:26:57 +08:00 |
|
liang.chao
|
f56367f300
|
新增装备修改
|
2024-12-20 15:26:51 +08:00 |
|
sxu
|
c01dc598cc
|
消息
|
2024-12-20 15:21:10 +08:00 |
|
sxu
|
d6c32552e0
|
Merge remote-tracking branch 'origin/master'
|
2024-12-20 14:26:12 +08:00 |
|
liang.chao
|
881052f5fb
|
获取检修预报警天数
|
2024-12-20 14:10:32 +08:00 |
|
sxu
|
00e601dd0b
|
消息
|
2024-12-20 13:56:34 +08:00 |
|
sxu
|
d8663f11a8
|
消息
|
2024-12-20 13:43:01 +08:00 |
|
sxu
|
c98f2cf6d1
|
Merge remote-tracking branch 'origin/master'
|
2024-12-20 11:20:07 +08:00 |
|
sxu
|
a67aaee31e
|
订单状态统计
|
2024-12-20 10:53:17 +08:00 |
|
liang.chao
|
9472c21b52
|
Merge remote-tracking branch 'origin/master'
|
2024-12-20 10:47:50 +08:00 |
|
liang.chao
|
c2a39013a4
|
装备详情增加质检记录
|
2024-12-20 10:47:36 +08:00 |
|
sxu
|
ba21aaa529
|
检修记录预报警天数
|
2024-12-19 19:04:36 +08:00 |
|
liang.chao
|
0abf58f281
|
个人信息修改
|
2024-12-19 15:10:29 +08:00 |
|
liang.chao
|
690e8d0576
|
订单详情查询bug修改
|
2024-12-19 13:10:38 +08:00 |
|
liang.chao
|
48d82a54d1
|
检修详情code回显
|
2024-12-19 11:15:03 +08:00 |
|
liang.chao
|
6ad88a582d
|
Merge remote-tracking branch 'origin/master'
|
2024-12-18 17:59:16 +08:00 |
|
liang.chao
|
82ae4f6d66
|
快捷消息回复返回报错修改
|
2024-12-18 17:58:50 +08:00 |
|
sxu
|
0738c49ea2
|
Merge remote-tracking branch 'origin/master'
|
2024-12-18 17:36:49 +08:00 |
|
sxu
|
3953474a88
|
减免
|
2024-12-18 17:36:19 +08:00 |
|
sxu
|
798d661796
|
减免
|
2024-12-18 17:28:45 +08:00 |
|
liang.chao
|
4d5c1b159c
|
综合查询-设备订单详情
|
2024-12-18 17:17:24 +08:00 |
|
liang.chao
|
e5f3e437f9
|
综合查询-设备订单详情
|
2024-12-18 16:52:12 +08:00 |
|
sxu
|
e02140f55d
|
减免
|
2024-12-18 16:43:33 +08:00 |
|
sxu
|
c8dd8523ba
|
Merge remote-tracking branch 'origin/master'
|
2024-12-18 16:37:35 +08:00 |
|
sxu
|
9082068c29
|
减免
|
2024-12-18 16:36:35 +08:00 |
|
liang.chao
|
d5170bf548
|
综合查询-设备订单详情
|
2024-12-18 16:14:34 +08:00 |
|
sxu
|
c4ebd6a1d3
|
fix conflict
|
2024-12-18 16:06:39 +08:00 |
|
sxu
|
ee6fe2c95c
|
减免
|
2024-12-18 16:04:13 +08:00 |
|
liang.chao
|
ee5eed0a59
|
综合查询-设备订单详情
|
2024-12-18 16:01:23 +08:00 |
|
liang.chao
|
05f6a6f9a0
|
综合查询-设备订单详情
|
2024-12-18 15:53:51 +08:00 |
|
liang.chao
|
443d65531c
|
综合查询-设备订单详情
|
2024-12-18 15:37:00 +08:00 |
|
sxu
|
e88ab56c07
|
减免
|
2024-12-18 15:24:16 +08:00 |
|
liang.chao
|
de6cdb60a8
|
综合查询-设备订单详情
|
2024-12-18 15:20:03 +08:00 |
|
liang.chao
|
7a27de3e84
|
文档url中文编码
|
2024-12-18 13:46:52 +08:00 |
|
liang.chao
|
b403c43c8b
|
Merge remote-tracking branch 'origin/master'
|
2024-12-18 13:35:12 +08:00 |
|
liang.chao
|
1f7b974e3f
|
综合查询-装备信息
|
2024-12-18 13:35:06 +08:00 |
|
sxu
|
34359bca8e
|
费用清单
|
2024-12-18 10:13:52 +08:00 |
|
sxu
|
05e1f46af3
|
Merge remote-tracking branch 'origin/master'
|
2024-12-17 21:17:23 +08:00 |
|
liang.chao
|
dc59a19176
|
租赁协议
|
2024-12-17 21:16:53 +08:00 |
|
sxu
|
56505c6a6e
|
订单出租方公司id
|
2024-12-17 21:16:38 +08:00 |
|
liang.chao
|
93b58cc96e
|
租赁协议
|
2024-12-17 21:05:08 +08:00 |
|
liang.chao
|
fedadfcd3c
|
租赁协议
|
2024-12-17 20:32:08 +08:00 |
|
sxu
|
e376a34bf3
|
Merge remote-tracking branch 'origin/master'
|
2024-12-17 16:12:29 +08:00 |
|
liang.chao
|
de01e01025
|
智能回复增加所属公司
|
2024-12-17 13:23:51 +08:00 |
|
liang.chao
|
f3e57f60c3
|
代码提交
|
2024-12-17 13:07:00 +08:00 |
|
sxu
|
67e780a527
|
Merge remote-tracking branch 'origin/master'
|
2024-12-17 11:12:05 +08:00 |
|
sxu
|
25e213e9d8
|
order detail improvement
|
2024-12-17 10:33:35 +08:00 |
|
liang.chao
|
c01ed44303
|
合同管理整改
|
2024-12-17 10:18:12 +08:00 |
|
liang.chao
|
16987ed624
|
合同模板
|
2024-12-17 09:58:52 +08:00 |
|
sxu
|
5a1cf0ab5d
|
order info improvement
|
2024-12-16 18:07:31 +08:00 |
|
sxu
|
0d20b8018e
|
Merge remote-tracking branch 'origin/master'
|
2024-12-16 17:29:01 +08:00 |
|
sxu
|
a6686c8a8f
|
sava devinfo
|
2024-12-16 17:28:37 +08:00 |
|
liang.chao
|
067192c825
|
智能回复
|
2024-12-16 17:23:57 +08:00 |
|
sxu
|
d8125a1d38
|
搜索
|
2024-12-16 17:23:17 +08:00 |
|
sxu
|
1ecf93db48
|
Revert "搜索"
This reverts commit 9d3f74efd3.
|
2024-12-16 17:22:19 +08:00 |
|
sxu
|
9d3f74efd3
|
搜索
|
2024-12-16 17:16:35 +08:00 |
|
sxu
|
c76fac5e55
|
类型上架数统计
|
2024-12-16 16:52:45 +08:00 |
|
sxu
|
6f2c413ef4
|
购物车地址
|
2024-12-16 13:31:52 +08:00 |
|
sxu
|
b64f24c2f2
|
公司统计上架数
|
2024-12-16 13:08:52 +08:00 |
|
sxu
|
d574a6b142
|
设备唯一标识符
|
2024-12-16 12:44:27 +08:00 |
|
sxu
|
7bdeb39530
|
收货地址
|
2024-12-16 12:19:23 +08:00 |
|
sxu
|
e604590cbd
|
收货地址
|
2024-12-16 12:16:11 +08:00 |
|
sxu
|
84de6a0cc6
|
Merge remote-tracking branch 'origin/master'
|
2024-12-16 12:11:57 +08:00 |
|
sxu
|
9da4995579
|
收货地址
|
2024-12-16 12:10:34 +08:00 |
|
sxu
|
19ff2c9619
|
收货地址
|
2024-12-16 11:00:02 +08:00 |
|
liang.chao
|
fb9435063c
|
合同状态修改
|
2024-12-13 18:07:40 +08:00 |
|
liang.chao
|
484c3b290f
|
数据隔离
|
2024-12-13 17:25:40 +08:00 |
|
liang.chao
|
3ef1f51584
|
租赁协议以及数据隔离
|
2024-12-13 17:09:37 +08:00 |
|
liang.chao
|
512b95fddd
|
合同管理
|
2024-12-13 14:34:22 +08:00 |
|
liang.chao
|
48269d19a8
|
租赁协议查看
|
2024-12-13 14:12:30 +08:00 |
|
liang.chao
|
14502ba6ce
|
合同管理接口开发
|
2024-12-13 11:19:18 +08:00 |
|
liang.chao
|
6a0c0ba5cd
|
合同管理接口开发
|
2024-12-13 10:59:30 +08:00 |
|
liang.chao
|
76c38b8620
|
合同管理接口开发
|
2024-12-13 10:51:34 +08:00 |
|
liang.chao
|
0347e19cce
|
合同管理接口开发
|
2024-12-13 10:27:53 +08:00 |
|
liang.chao
|
bc3f972a45
|
Merge remote-tracking branch 'origin/master'
|
2024-12-12 18:22:18 +08:00 |
|
liang.chao
|
c3102ddbcc
|
标签管理，维修保养管理
|
2024-12-12 18:22:12 +08:00 |
|
sxu
|
a93f327842
|
接单详情
|
2024-12-12 16:06:19 +08:00 |
|
sxu
|
8b3ad3bade
|
接单详情
|
2024-12-12 16:02:13 +08:00 |
|
sxu
|
82f364a7c5
|
接单详情
|
2024-12-12 15:53:24 +08:00 |
|
sxu
|
c63ff56235
|
退租检修
|
2024-12-12 13:06:12 +08:00 |
|
sxu
|
3e46f5ae35
|
退租检修
|
2024-12-11 18:09:48 +08:00 |
|
sxu
|
907f7034ea
|
费用减免
|
2024-12-11 16:40:17 +08:00 |
|
sxu
|
9a98981b64
|
单独退租
|
2024-12-11 15:36:26 +08:00 |
|
sxu
|
bf1b71ad55
|
单独退租
|
2024-12-11 15:00:31 +08:00 |
|
sxu
|
9d68eeacfc
|
增加配置属性
|
2024-12-11 12:56:38 +08:00 |
|
sxu
|
954da9f9b7
|
增加配置属性
|
2024-12-11 12:13:04 +08:00 |
|
sxu
|
fda3089c7e
|
根据类型加载属性
|
2024-12-10 18:34:52 +08:00 |
|
sxu
|
0c4d7efde2
|
增加配置属性
|
2024-12-10 16:49:15 +08:00 |
|
liang.chao
|
1eee9bfe05
|
更新时间字段更新
|
2024-12-10 15:58:10 +08:00 |
|
liang.chao
|
7fb5fc3d53
|
Merge remote-tracking branch 'origin/master'
|
2024-12-10 13:39:29 +08:00 |
|
liang.chao
|
3a0016321e
|
安全证书
|
2024-12-10 13:39:23 +08:00 |
|
sxu
|
7bca69e746
|
增加配置属性
|
2024-12-10 10:46:36 +08:00 |
|
sxu
|
7849348924
|
增加配置属性
|
2024-12-10 10:07:51 +08:00 |
|
liang.chao
|
c58aa96c9f
|
装备质检接口开发，联调
|
2024-12-09 17:45:05 +08:00 |