 syruan
|
87f37c20b9
|
设备表
|
2025-10-14 23:00:47 +08:00 |
jiang
|
23d5e6b4f6
|
问题修改
|
2025-10-14 23:00:05 +08:00 |
itcast
|
4d5c9b0abb
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-10-14 22:22:57 +08:00 |
|
itcast
|
1a3ea4d4c4
|
装备类型配置页面，特征值设置还有部分未完成
|
2025-10-14 22:22:03 +08:00 |
|
jiang
|
bac4027c05
|
问题修改
|
2025-10-14 20:20:27 +08:00 |
|
syruan
|
5d025d86b8
|
订单处理
|
2025-10-14 20:18:12 +08:00 |
|
itcast
|
f55cd76970
|
装备类型配置页面，特征值未完成
|
2025-10-14 17:36:05 +08:00 |
|
jiang
|
f7150d486d
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-10-14 17:23:22 +08:00 |
|
syruan
|
aa8e5f5d6d
|
订单处理
|
2025-10-14 17:22:50 +08:00 |
|
jiang
|
6edc3782c6
|
问题修改
|
2025-10-14 17:22:35 +08:00 |
|
syruan
|
1784825d15
|
修正缺失的字段
|
2025-10-13 22:26:47 +08:00 |
|
jiang
|
057da98918
|
问题修改
|
2025-10-13 21:54:40 +08:00 |
|
syruan
|
01a103ab71
|
企业地址
|
2025-10-13 21:17:39 +08:00 |
|
syruan
|
38b4be520a
|
去除费用相关
|
2025-10-13 21:11:56 +08:00 |
|
syruan
|
1792a84d4f
|
冗余修正
|
2025-10-13 21:05:22 +08:00 |
|
syruan
|
225fe39491
|
修正getCompanyId
|
2025-10-13 20:59:58 +08:00 |
|
syruan
|
aeeec68232
|
修改mapper
|
2025-10-13 19:22:03 +08:00 |
|
jiang
|
ad1a3e1980
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-10-13 19:16:47 +08:00 |
|
jiang
|
f527ce1bda
|
问题修改
|
2025-10-13 19:16:40 +08:00 |
|
syruan
|
8ac9ac3dab
|
修改mapper
|
2025-10-13 19:16:20 +08:00 |
|
syruan
|
1de0d396b1
|
去冲冗余参数，修改对应mapper
|
2025-10-13 16:58:17 +08:00 |
|
syruan
|
d6c8a97237
|
去冲冗余参数，修改对应mapper
|
2025-10-13 14:25:44 +08:00 |
|
jiang
|
59d67fbadc
|
问题修改
|
2025-10-12 14:16:35 +08:00 |
|
jiang
|
a1d5f3ac04
|
问题修改
|
2025-10-10 21:51:34 +08:00 |
|
jiang
|
015a44309e
|
问题修改
|
2025-09-27 11:16:22 +08:00 |
|
jiang
|
04e2852366
|
问题修改
|
2025-09-25 19:20:28 +08:00 |
|
jiang
|
70f17ac59b
|
问题修改
|
2025-09-22 18:57:42 +08:00 |
|
jiang
|
04d000d0e2
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-09-22 18:53:35 +08:00 |
|
jiang
|
742a8b31c4
|
问题修改
|
2025-09-22 18:53:28 +08:00 |
|
syruan
|
27cc4272ea
|
refactor: simplify proList method by removing commented-out grouping logic
|
2025-09-22 15:22:11 +08:00 |
|
syruan
|
d460556a4e
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-09-22 13:08:20 +08:00 |
|
syruan
|
d17d536991
|
refactor: simplify CityScreenMapper queries by removing redundant conditions and adding longitude/latitude fields
|
2025-09-22 13:08:12 +08:00 |
|
jiang
|
264d2c96ad
|
问题修改
|
2025-09-22 10:00:27 +08:00 |
|
syruan
|
fb0ec77c8f
|
feat: update configuration and enhance MaType handling with new state grid property
|
2025-09-19 17:49:36 +08:00 |
|
syruan
|
bd3f58d888
|
装备类型调整
|
2025-09-18 20:09:01 +08:00 |
|
syruan
|
a08a45b216
|
enhance equipment management with new SysDeptVO and improved error handling
|
2025-09-17 18:10:01 +08:00 |
|
jiang
|
1e1db1892d
|
问题修改
|
2025-09-16 18:27:18 +08:00 |
|
syruan
|
8c16a8b9e7
|
fix(province): improve error handling and logging in equipment configuration retrieval
|
2025-09-16 18:12:03 +08:00 |
 马三炮
|
97eb09437b
|
大屏
|
2025-09-16 16:26:10 +08:00 |
|
马三炮
|
c20c941662
|
大屏
|
2025-09-16 08:55:56 +08:00 |
 jjLv
|
3221baa785
|
地市大屏
|
2025-09-15 23:46:00 +08:00 |
|
jjLv
|
6edbbe9db3
|
地市大屏
|
2025-09-15 23:24:54 +08:00 |
|
马三炮
|
ec17584681
|
大屏
|
2025-09-15 23:21:46 +08:00 |
方亮
|
ac05148928
|
添加装备/装备台账
|
2025-09-15 23:19:41 +08:00 |
|
方亮
|
da7eea810d
|
添加装备/装备台账
|
2025-09-15 21:56:18 +08:00 |
 haozq
|
92a57ff383
|
修改包
|
2025-09-15 20:42:21 +08:00 |
|
syruan
|
3db006b061
|
移除未使用的短信依赖包
- 删除了 OrderMapper 接口中 updateOrderStatus 方法的多余逗号
- 移除了 pom.xml 中未使用的短信依赖包 sms-util
|
2025-09-15 15:11:52 +08:00 |
|
马三炮
|
e7700f872c
|
大屏
|
2025-09-15 10:02:17 +08:00 |
|
马三炮
|
e7228b3177
|
大屏
|
2025-09-15 09:46:49 +08:00 |
|
syruan
|
610c290d1f
|
添加测试配置文件和省公司短信依赖
- 新增 bootstrap-material_mall_test.yml 测试配置文件
- 添加省公司短信sms-util依赖- 更新pom.xml文件，包含新增的短信依赖包
|
2025-09-15 09:09:13 +08:00 |
|
syruan
|
4f6c7d6b1a
|
feat(device): 新增设备管理方式字段
- 在 DevInfo 类中添加 deviceType 字段，用于表示设备管理方式（0: 编码, 1: 数量）- 在 DevInfoMapper.xml 中添加
|
2025-09-15 00:09:22 +08:00 |
|
haozq
|
5ea33d61e5
|
修改包
|
2025-09-14 22:16:28 +08:00 |
|
haozq
|
a22d10e8f9
|
修改包
|
2025-09-14 15:56:37 +08:00 |
|
syruan
|
154e17ad50
|
添加装备原值和规格名称字段
- 在 DevInfo 类中添加 buyPrice 和 itemTypeModel 字段
- 更新 DevInfoMapper.xml，增加新字段的映射和操作
|
2025-09-13 20:25:59 +08:00 |
|
jiang
|
bbdb2ee405
|
装备配置管理
|
2025-08-12 18:52:34 +08:00 |
|
jiang
|
3958bfad7d
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-07-31 17:42:10 +08:00 |
|
jiang
|
8d2181b7f7
|
装备配置管理
|
2025-07-31 17:42:00 +08:00 |
 mashuai
|
6ed92f3bf9
|
大屏优化
|
2025-07-16 08:54:00 +08:00 |
 lizhenhua
|
252136cfeb
|
装备管理 youhua
|
2025-07-12 14:37:38 +08:00 |
|
lizhenhua
|
e4d2e7abf8
|
装备管理 youhua
|
2025-07-10 18:41:40 +08:00 |
|
lizhenhua
|
9af0b8e332
|
装备管理 youhua
|
2025-07-10 17:11:43 +08:00 |
|
lizhenhua
|
21e47c1c78
|
装备管理 youhua
|
2025-07-10 15:47:00 +08:00 |
|
lizhenhua
|
9d0d798e1a
|
装备管理 youhua
|
2025-07-10 10:46:43 +08:00 |
|
lizhenhua
|
ef087b8e4a
|
装备管理 youhua
|
2025-07-09 12:32:07 +08:00 |
|
lizhenhua
|
8af623096c
|
装备管理 youhua
|
2025-07-09 09:42:47 +08:00 |
|
mashuai
|
beef2f7944
|
优化
|
2025-07-07 19:14:16 +08:00 |
 liang.chao
|
5bd24cec66
|
代码提交
|
2025-07-07 10:06:32 +08:00 |
|
liang.chao
|
3c694f2fd9
|
代码提交
|
2025-07-07 08:52:02 +08:00 |
|
liang.chao
|
9db8a043a9
|
代码提交
|
2025-07-04 16:37:48 +08:00 |
|
liang.chao
|
205b9b5801
|
代码提交
|
2025-07-04 15:34:23 +08:00 |
|
liang.chao
|
4085364894
|
装备编辑可修改装备租金
|
2025-07-04 09:33:49 +08:00 |
|
liang.chao
|
e46bca6cdb
|
大屏页面优化接口开发
|
2025-07-03 17:06:46 +08:00 |
syruan
|
6f2587611c
|
增加上传人和上传时间字段
|
2025-06-02 16:25:12 +08:00 |
 bonus
|
f159763290
|
聊天对话修改
|
2025-06-02 15:51:39 +08:00 |
|
syruan
|
bdadacb5eb
|
订单短息发送修改
|
2025-06-02 13:24:29 +08:00 |
|
mashuai
|
e3ceb4d975
|
优化
|
2025-04-30 15:49:29 +08:00 |
|
bonus
|
50a4660f10
|
大屏类型在租次数修改
|
2025-04-25 11:24:45 +08:00 |
|
马三炮
|
368cf57386
|
bug修复
|
2025-03-26 17:55:16 +08:00 |
|
mashuai
|
96adeade60
|
优化
|
2025-03-19 17:12:47 +08:00 |
|
mashuai
|
efe800a554
|
优化
|
2025-03-19 13:27:53 +08:00 |
|
mashuai
|
15f9818de6
|
优化
|
2025-03-19 12:38:59 +08:00 |
|
mashuai
|
ff6e0798a9
|
校验
|
2025-03-19 10:18:04 +08:00 |
|
mashuai
|
b5467a9d3d
|
校验
|
2025-03-19 10:16:12 +08:00 |
|
mashuai
|
e4fd3d5dff
|
大屏二级页面
|
2025-03-18 18:15:52 +08:00 |
|
马三炮
|
6e29cea504
|
二级页面
|
2025-03-18 18:12:17 +08:00 |
|
mashuai
|
8c7454d22f
|
大屏二级页面
|
2025-03-18 14:34:45 +08:00 |
|
马三炮
|
277e8916c6
|
二级页面
|
2025-03-18 14:01:01 +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
|
893f67f82a
|
设备新增
|
2025-03-18 08:46:10 +08:00 |
|
mashuai
|
ae452f8598
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-03-17 18:32:42 +08:00 |
|
马三炮
|
ccd91a2469
|
日志打印
|
2025-03-17 18:26:11 +08:00 |
|
马三炮
|
384287db5c
|
需求通知
|
2025-03-17 18:12:21 +08:00 |
|
mashuai
|
0e3276f618
|
11
|
2025-03-17 18:11:07 +08:00 |
|
马三炮
|
fb771ae29c
|
使用率
|
2025-03-17 16:20:11 +08:00 |
|
mashuai
|
ba6b3496d5
|
优化
|
2025-03-17 15:21:18 +08:00 |
|
mashuai
|
69938dc39f
|
大屏
|
2025-03-17 13:06:03 +08:00 |
|
马三炮
|
c230d6b179
|
防止重复提交
|
2025-03-17 09:53:39 +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
|
0d53f44ee7
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-03-12 14:52:53 +08:00 |
|
mashuai
|
92f51eb9c0
|
通知公告
|
2025-03-12 14:52:48 +08:00 |
 hongchao
|
2bd60efa21
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-03-11 18:21:38 +08:00 |
|
hongchao
|
c821ec5051
|
数量装备流程
|
2025-03-11 18:21:24 +08:00 |
|
mashuai
|
f2e39fd91a
|
优化
|
2025-03-11 16:23:51 +08:00 |
|
mashuai
|
a87afeef23
|
优化
|
2025-03-11 15:05:03 +08:00 |
|
mashuai
|
e61f3a5392
|
文件名优化
|
2025-03-11 10:59:40 +08:00 |
|
hongchao
|
fddfd688a7
|
bug 修复
|
2025-03-10 16:57:28 +08:00 |
|
mashuai
|
9203277953
|
功能需求优化
|
2025-03-10 10:55:38 +08:00 |
|
mashuai
|
e002af3c3a
|
功能需求优化
|
2025-03-10 10:48:40 +08:00 |
|
syruan
|
a8a64cc426
|
新增企业专区接口，合同修改
|
2025-02-28 13:30:24 +08:00 |
|
syruan
|
5c87a37002
|
省公司短信平台
|
2025-02-26 18:11:52 +08:00 |
|
mashuai
|
6f3f7d9c32
|
功能需求优化
|
2025-02-26 14:59:21 +08:00 |
|
mashuai
|
aad1c1e315
|
功能需求优化
|
2025-02-26 14:49:13 +08:00 |
|
mashuai
|
243465b36e
|
功能需求优化
|
2025-02-26 14:44:48 +08:00 |
|
syruan
|
7cd842073e
|
订单短信发送1
|
2025-02-25 17:10:55 +08:00 |
|
mashuai
|
50b984ba3b
|
功能需求优化
|
2025-02-25 16:50:16 +08:00 |
|
mashuai
|
e45a54511d
|
功能需求优化
|
2025-02-25 15:05:00 +08:00 |
|
syruan
|
94c04684dc
|
订单短信发送
|
2025-02-25 13:54:46 +08:00 |
|
mashuai
|
249cc4553c
|
Merge remote-tracking branch 'origin/ah-simple' into ah-simple
|
2025-02-25 13:52:19 +08:00 |
|
mashuai
|
1c18b649f9
|
功能需求优化
|
2025-02-25 13:52:11 +08:00 |
|
syruan
|
c62c65e34f
|
订单短信发送
|
2025-02-24 18:27: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 |
|
mashuai
|
f194335742
|
功能需求优化
|
2025-02-21 17:33:09 +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
|
c718321ee3
|
Merge branch 'master' into ah-simple
|
2025-01-16 11:00:21 +08:00 |
|
sxu
|
6fc53f04cc
|
Revert "slideshow"
This reverts commit 69795a9617.
|
2025-01-16 10:59:56 +08:00 |
|
sxu
|
be9c1bbb09
|
slideshow
|
2025-01-16 10:58:49 +08:00 |
|
sxu
|
69795a9617
|
slideshow
|
2025-01-16 09:42:07 +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
|
785245727e
|
Merge branch 'master' into ah-simple
|
2025-01-10 12:06:13 +08:00 |
|
sxu
|
33c5a13100
|
修复个人中心电话显示问题
|
2025-01-10 12:05:03 +08:00 |