Commit Graph

47 Commits

Author SHA1 Message Date
马三炮 8972e9adba 监理单位,专责新建审核流bug修复 2025-06-03 09:46:26 +08:00
马三炮 1fb21ef912 监理人员入场出场审核流 2025-05-29 18:13:44 +08:00
马三炮 d8b5a24bfa 新增监理人员列表和查询接口 2025-05-27 18:22:57 +08:00
马三炮 ce2d341234 监理单位,专责新建审核流bug修复 2025-05-27 10:37:03 +08:00
马三炮 acc7035214 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java
#	bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java
#	bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java
2025-05-13 17:19:07 +08:00
马三炮 31efd2cea2 新增二级页面已经跳转 2025-05-13 17:16:12 +08:00
haozq 6cb78673f9 系统bug修改 2025-04-02 10:18:06 +08:00
haozq 8e21bb3a13 系统bug修改 2025-03-27 14:30:26 +08:00
haozq ab06e5c345 审核业务逻辑修改 2025-03-05 15:15:56 +08:00
haozq 905134612e bug修改 2025-03-04 19:01:58 +08:00
haozq 106d310866 bug修改 2025-03-04 19:00:38 +08:00
haozq 870c277a9e bug修改 2025-02-28 12:28:17 +08:00
haozq d36b5b44ef 修改导入 校验 2025-02-27 09:19:50 +08:00
haozq d77643a3fb 修改导入人员重复bug 2025-02-21 19:01:57 +08:00
haozq 43aa1c638f 查询bug修改 2025-02-21 14:25:02 +08:00
haozq a0ad5ca4be 查询bug修改 2025-02-21 09:44:16 +08:00
haozq 3cdf018629 查询bug修改 2025-02-20 18:38:04 +08:00
haozq 369e6bc0aa 查询bug修改 2025-02-20 13:29:19 +08:00
haozq 38f695539e 修改审核重新提交节点 2025-02-19 16:35:47 +08:00
haozq 716676d42f 修改审核重新提交节点 2025-02-19 16:33:51 +08:00
haozq 28be0a9332 修改审核节点数据查询及分页 2025-02-19 11:20:21 +08:00
haozq ac2c7c252c 修改分页 2025-02-18 16:19:58 +08:00
haozq 632951d628 承包商审核必填校验 2025-02-17 15:35:21 +08:00
haozq 3e7b92a246 Merge remote-tracking branch 'origin/master' 2025-02-14 16:56:04 +08:00
haozq c58e1ca973 修改待审核数据查询 2025-02-14 16:55:56 +08:00
liang.chao 7a29fcddaa 监理人员删除功能修改 2025-02-14 15:48:21 +08:00
15856 2c7b4534a6 bug修复 2025-02-14 09:46:46 +08:00
liang.chao c55848200e 监理人员新增删除按钮 2025-02-13 18:03:17 +08:00
liang.chao b02599f3a1 Merge remote-tracking branch 'origin/master' 2025-02-13 16:39:44 +08:00
haozq 91c7522135 bug修改 2025-02-13 16:38:54 +08:00
liang.chao d18ec8b651 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java
2025-02-13 16:37:38 +08:00
liang.chao 8a1d193ac9 bug修改 2025-02-13 16:36:47 +08:00
haozq 3e14466911 Merge remote-tracking branch 'origin/master' 2025-02-12 15:29:36 +08:00
liux 4ec7bd6e98 Merge remote-tracking branch 'origin/master' 2025-02-12 15:17:49 +08:00
liux a9f31a85a3 更换git仓库地址首次提交 2025-02-12 15:06:15 +08:00
haozq a7cca53515 监理单位模块修改 2025-02-11 16:04:00 +08:00
haozq 44a96f1999 监理单位模块修改 2025-02-10 18:18:55 +08:00
haozq 3d161ee983 Merge remote-tracking branch 'origin/master' 2025-02-10 15:42:50 +08:00
haozq bdc939ece2 工程总监下拉选修改 2025-02-10 15:42:24 +08:00
liang.chao 397c7d0a5a Merge remote-tracking branch 'origin/master' 2025-02-08 18:30:33 +08:00
liang.chao da6bb4d8c4 禅道bug解决 2025-02-08 18:30:21 +08:00
haozq 133041bf6d 修改bug 2025-02-08 17:50:59 +08:00
haozq da8aa4362a 修改状态定时任务bug 2025-02-08 14:08:20 +08:00
haozq ee4ea188b9 修改解密返回参数、设备添加字段修改 2025-02-07 13:28:18 +08:00
tqzhang a6e3f6137f 监理、承包、分包新增人员 2025-01-22 15:08:21 +08:00
tqzhang ed487edfd2 测试问题修改 2025-01-17 17:23:45 +08:00
liux 4ecaf291a7 更换git仓库地址首次提交 2025-01-16 16:16:53 +08:00