Commit Graph

33 Commits

Author SHA1 Message Date
haozq 4835c32f48 Merge remote-tracking branch 'origin/master' 2025-02-14 11:24:16 +08:00
haozq 1f7624c91f 添加短信通知 2025-02-14 11:08:37 +08:00
15856 2c7b4534a6 bug修复 2025-02-14 09:46:46 +08:00
liang.chao cec5657dec 重复代码提交 2025-02-14 09:23:08 +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 fd37421ae5 更换git仓库地址首次提交 2025-02-12 15:10:38 +08:00
liux a9f31a85a3 更换git仓库地址首次提交 2025-02-12 15:06:15 +08:00
liang.chao 72b53ce476 学习任务中,时长未统计bug修改 2025-02-12 14:10:04 +08:00
liang.chao c09e3e312b 学员管理增加统计页面 2025-02-12 10:42:19 +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 22d63b5d1b Merge remote-tracking branch 'origin/master' 2025-02-08 17:51:14 +08:00
haozq 133041bf6d 修改bug 2025-02-08 17:50:59 +08:00
haozq da8aa4362a 修改状态定时任务bug 2025-02-08 14:08:20 +08:00
liang.chao 48a9acbed0 学员档案页面报错修改 2025-02-08 09:01:41 +08:00
haozq ee4ea188b9 修改解密返回参数、设备添加字段修改 2025-02-07 13:28:18 +08:00
tqzhang c025df74c8 人员导入修改 2025-01-22 15:37:47 +08:00
tqzhang a6e3f6137f 监理、承包、分包新增人员 2025-01-22 15:08:21 +08:00
tqzhang e2ee7bc418 人员文件导入乱码动态处理 2025-01-21 09:27:21 +08:00
tqzhang a25fd6b832 人员上传问题修改 2025-01-20 18:34:23 +08:00
tqzhang a4380c4309 人员上传问题修改 2025-01-20 09:16:52 +08:00
tqzhang ed487edfd2 测试问题修改 2025-01-17 17:23:45 +08:00
liux 4ecaf291a7 更换git仓库地址首次提交 2025-01-16 16:16:53 +08:00