Commit Graph

593 Commits

Author SHA1 Message Date
itcast 1a3ea4d4c4 装备类型配置页面,特征值设置还有部分未完成 2025-10-14 22:22:03 +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
方亮 39727d504d Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-09-15 21:52:49 +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
方亮 c657f023f6 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-09-14 23:01:02 +08:00
haozq 5ea33d61e5 修改包 2025-09-14 22:16:28 +08:00
方亮 967522cec5 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-09-14 16:06:21 +08:00