|
|
6199555729
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-10-17 18:48:44 +08:00 |
|
|
|
03a64da51a
|
配置填错了
|
2025-10-16 17:03:06 +08:00 |
|
|
|
7d249778b2
|
Merge branch 'uat' into dunhuang
|
2025-10-11 17:03:10 +08:00 |
|
|
|
d3438c520e
|
允许html上传
|
2025-10-11 17:02:53 +08:00 |
|
|
|
5441abe588
|
修改工单bug
|
2025-09-29 17:31:14 +08:00 |
|
|
|
98791b9d6c
|
登录改成数字验证码等其他修复
|
2025-09-29 17:23:31 +08:00 |
|
|
|
6de1f82747
|
《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换
|
2025-09-26 18:29:54 +08:00 |
|
|
|
43ad1fc4db
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:52:22 +08:00 |
|
|
|
f2f27114a8
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:49:04 +08:00 |
|
|
|
85ab953526
|
加上apk
|
2025-09-19 09:04:55 +08:00 |
|
|
|
642cb0d61e
|
优化权限和上传文件等1
|
2025-09-09 18:52:39 +08:00 |
|
|
|
eb4823bf5a
|
优化权限和上传文件等
|
2025-09-09 17:55:41 +08:00 |
|
|
|
7a6a3232ea
|
合并到jdk17分支
|
2025-09-04 10:34:04 +08:00 |
|
|
|
62498614ae
|
升级jdk17
|
2025-08-20 16:08:13 +08:00 |
|
|
|
fd4fba18f5
|
升级jdk17
|
2025-08-19 17:22:36 +08:00 |
|
|
|
4a4409c62e
|
Merge branch 'prod' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
|
2025-08-13 15:50:38 +08:00 |
|
|
|
8135452f87
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-12 17:14:07 +08:00 |
|
|
|
5101d248a5
|
仁智测控转发扬尘Hj212集成
|
2025-08-12 17:14:01 +08:00 |
|
|
|
dc37ecc9b2
|
正赢增加人脸心跳检测
|
2025-08-12 10:55:57 +08:00 |
|
|
|
6ad362778a
|
正赢增加人脸心跳检测
|
2025-08-12 09:41:20 +08:00 |
|
|
|
b05f69ebca
|
人脸设备对接
|
2025-07-31 11:07:51 +08:00 |
|
|
|
1b0fb0331b
|
ocr和施工日志
|
2025-07-25 18:07:45 +08:00 |
|
|
|
6e0f08bfa9
|
人脸设备对接
|
2025-07-21 10:44:43 +08:00 |
|
|
|
1058c49316
|
模拟数据生成
|
2025-05-10 11:51:35 +08:00 |
|
|
|
6e8b06cd93
|
AI功能
|
2025-04-11 17:30:52 +08:00 |
|
|
|
d203bb2a59
|
考勤信息转发去除
|
2024-12-23 10:31:21 +08:00 |
|
|
|
8bf845a823
|
去掉口罩提示
|
2024-09-24 19:11:53 +08:00 |
|
|
|
17da925e66
|
连接池配置改正确
|
2024-09-14 09:26:34 +08:00 |
|
|
|
93c2e9b974
|
风险预测
|
2024-06-19 20:20:07 +08:00 |
|
|
|
b9debfecd0
|
日志修改
|
2024-06-01 14:37:49 +08:00 |
|
|
|
cc0080374e
|
萨达电箱对接
|
2024-05-18 01:06:42 +08:00 |
|
|
|
841a3001cf
|
bug修改
|
2024-05-12 15:54:38 +08:00 |
|
|
|
9c4a9cf981
|
redisson分布式锁
|
2024-05-07 19:45:36 +08:00 |
|
|
|
09529fb4ba
|
bug修复
|
2024-05-06 00:25:07 +08:00 |
|
|
|
a215665d59
|
bug修复
|
2024-05-05 17:59:06 +08:00 |
|
|
|
691772b73b
|
配置修改
|
2024-04-18 21:55:23 +08:00 |
|
|
|
314f2e91cc
|
bug修复
|
2024-04-18 20:21:10 +08:00 |
|
|
|
5891131bdb
|
bug修改
|
2024-04-17 20:52:27 +08:00 |
|
|
|
c72d566866
|
bug修改
|
2024-04-17 17:04:18 +08:00 |
|
|
|
f6f7b7b76c
|
bug修改
|
2024-04-17 10:58:13 +08:00 |
|
guo
|
36bf31407f
|
bug修复
|
2024-04-01 15:56:29 +08:00 |
|
|
|
4a74e71a52
|
工作流集成
|
2024-03-26 10:11:23 +08:00 |
|
guo
|
c8a795899a
|
bug修复
|
2024-03-22 19:18:22 +08:00 |
|
guo
|
58be0d1ea5
|
bug修复
|
2024-03-21 13:45:08 +08:00 |
|
guo
|
9a64889d07
|
bug修复
|
2024-01-02 18:35:40 +08:00 |
|
guo
|
67ee1959a1
|
bug修复
|
2023-12-16 11:32:44 +08:00 |
|
guo
|
75f91cbc5b
|
bug修复
|
2023-12-14 10:39:21 +08:00 |
|
guo
|
55a2be9cde
|
bug修复
|
2023-12-11 14:24:38 +08:00 |
|
guo
|
c8d2f73f8e
|
修改bug
|
2023-10-23 17:51:08 +08:00 |
|
guo
|
dbf9a74e71
|
党建
|
2023-10-16 15:07:51 +08:00 |
|
