Commit Graph

682 Commits

Author SHA1 Message Date
itcast 29fb997280 代码提交 2025-11-20 18:03:23 +08:00
jiang 5a970eff6a 问题修改 2025-11-20 18:01:26 +08:00
mashuai 45b9fc59fc 优化 2025-11-19 14:06:09 +08:00
mashuai a15c1398d0 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-11-19 13:45:39 +08:00
mashuai 30b8e8d11b 优化 2025-11-19 13:45:25 +08:00
hayu 54df56659f 维修 2025-11-18 16:18:54 +08:00
itcast 717d1008b6 工程管理 2025-11-18 10:27:29 +08:00
itcast f52f693a39 工程管理 2025-11-18 10:03:59 +08:00
syruan ed945d0ecc 退役申请及审批 2025-11-16 23:57:57 +08:00
hayu f5c75d7506 维修 2025-11-16 20:33:26 +08:00
jiang a9f0ef277b 问题修改 2025-11-16 19:41:39 +08:00
jiang 9a59617c3a 问题修改 2025-11-16 18:11:01 +08:00
itcast 2eed453e53 上下架管理 2025-11-16 18:08:49 +08:00
hayu 61fa7f53fd Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-11-16 16:19:44 +08:00
hayu 0fa6e15bae 维修 2025-11-16 16:19:33 +08:00
jiang 96a73cca84 问题修改 2025-11-16 16:19:13 +08:00
mashuai 8396c4158f 优化 2025-11-16 15:52:32 +08:00
mashuai bf6b56ef90 退库 2025-11-16 15:49:46 +08:00
mashuai 6a733f4bb0 退库 2025-11-16 15:41:53 +08:00
mashuai a897062d74 退库 2025-11-16 15:27:40 +08:00
mashuai b3967f7e24 退库 2025-11-16 15:25:17 +08:00
mashuai c456eb6ce3 退库 2025-11-16 14:35:22 +08:00
mashuai 3d92c34bd7 退库 2025-11-16 14:05:50 +08:00
jiang 7c145a07c5 Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceInfo.java
2025-11-16 13:53:04 +08:00
jiang f1bdd25aa0 问题修改 2025-11-16 13:52:41 +08:00
hayu 2ca49c4884 维修 2025-11-16 00:52:27 +08:00
hayu 5a787c9de0 维修 2025-11-15 23:36:39 +08:00
jiang f707f0d06f 问题修改 2025-11-15 21:57:09 +08:00
mashuai e837e9c01d 领用出库 2025-11-15 19:17:29 +08:00
mashuai 53ac43dcb2 领用出库 2025-11-15 18:18:35 +08:00
hayu 5f67ecde62 维修 2025-11-15 16:28:22 +08:00
mashuai dc454ecac1 领用出库 2025-11-15 15:12:11 +08:00
mashuai 091342bd87 领用出库 2025-11-15 15:11:27 +08:00
mashuai 297dc2c3c0 领用出库 2025-11-15 15:07:28 +08:00
jiang a0c43fa985 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-11-14 18:07:00 +08:00
jiang c97af40632 问题修改 2025-11-14 18:06:44 +08:00
itcast 02d0dbba93 工程管理 2025-11-14 18:06:35 +08:00
jiang fc34caabfd 问题修改 2025-11-13 19:34:13 +08:00
jiang 40f857458b 问题修改 2025-11-12 18:23:14 +08:00
jiang 8435db8876 问题修改 2025-11-07 18:00:43 +08:00
jiang 76a2ef5347 问题修改 2025-11-03 09:18:18 +08:00
itcast 02928c3ab3 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-10-29 18:41:17 +08:00
itcast 086f68ff22 装备台账页面 2025-10-29 18:40:56 +08:00
jiang 20c1fdb5a1 问题修改 2025-10-29 18:17:47 +08:00
jiang 2b29489f2c 问题修改 2025-10-29 18:14:07 +08:00
jiang 199b2ef82d 问题修改 2025-10-27 15:14:42 +08:00
jiang 010b0950ac 问题修改 2025-10-22 16:24:05 +08:00
jiang 68555df7f1 问题修改 2025-10-16 19:56:35 +08:00
itcast 76ea66ac9d 装备类型配置页面 2025-10-16 19:29:36 +08:00
jiang 67b0771294 问题修改 2025-10-16 19:27:09 +08:00
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