Commit Graph

715 Commits

Author SHA1 Message Date
lizhenhua e48b2c58bf 装备管理 youhua 2025-12-11 17:54:20 +08:00
syruan d5125993c0 优化Excel导出功能,确保所有单元格居中对齐,并重构相关工具类 2025-12-11 15:17:53 +08:00
jiang 08b1ed900a Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test 2025-12-11 09:12:46 +08:00
jiang 84a03fcf49 问题修改 2025-12-11 09:09:40 +08:00
itcast 32f24bd0cb 代码提交 2025-12-10 11:32:31 +08:00
itcast ad27e10673 代码提交 2025-12-10 10:40:36 +08:00
jiang fa29836d30 问题修改 2025-12-10 09:10:19 +08:00
itcast 5b091d5ec5 代码提交 2025-12-09 17:04:44 +08:00
itcast 3c1c61fc5a Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test 2025-12-09 13:40:34 +08:00
itcast bd2901c089 代码提交 2025-12-09 13:40:27 +08:00
itcast d90af2e3f3 代码提交 2025-12-09 13:40:20 +08:00
jiang 0e0ff334d0 问题修改 2025-12-09 08:58:55 +08:00
itcast 22a6f9017b 代码提交 2025-12-04 09:14:26 +08:00
mashuai c215082fc2 权限 2025-12-03 18:56:47 +08:00
mashuai b7f5fefc00 退役审核优化 2025-12-03 10:41:56 +08:00
mashuai 5edcb90a8f 审核优化 2025-12-02 18:16:53 +08:00
jiang 958a675a89 Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test 2025-12-02 10:28:25 +08:00
jiang 5b44b833ef 问题修改 2025-12-02 10:28:16 +08:00
itcast ef7e3f9093 Merge remote-tracking branch 'origin/ah-simple-test' into ah-simple-test 2025-12-01 17:24:06 +08:00
jiang 6abbc18578 问题修改 2025-12-01 17:23:50 +08:00
itcast c04da66d17 代码提交 2025-12-01 17:23:47 +08:00
jiang 2af5fb31d0 问题修改 2025-11-28 18:07:39 +08:00
jiang 5cdcfd2460 问题修改 2025-11-28 17:38:52 +08:00
syruan a2615d9e69 新增审批流全套接口及SQL,包括审批实例、审批流程、审批记录等功能 2025-11-27 20:28:31 +08:00
jiang c4c2d764a4 问题修改 2025-11-27 16:28:28 +08:00
itcast 0635c72f1f 代码提交 2025-11-26 18:45:06 +08:00
itcast 1cf620e929 代码提交 2025-11-26 17:05:58 +08:00
jiang 5cf0ce7ec5 问题修改 2025-11-25 19:08:55 +08:00
itcast bc6a0b6195 代码提交 2025-11-25 19:08:17 +08:00
jiang f6e70c3fb6 问题修改 2025-11-25 15:50:08 +08:00
itcast 399796aa27 代码提交 2025-11-24 18:12:25 +08:00
itcast 96f4d991ab 代码提交 2025-11-21 14:02:24 +08:00
jiang 7591c76c45 Merge branch 'refs/heads/ah-simple' into ah-simple-test
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/project/service/impl/RegionServiceImpl.java
2025-11-20 18:04:35 +08:00
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