Commit Graph

Select branches

Hide Pull Requests

baotou

dameng

desensitize

dunhuan_jdk8

dunhuang

guangshengaosu

hole_jdk17

mod_security

prod

uat

angang-deploy

angang-deploy-new

angang-two

duhaipeng

guoshengxiong

jihe_dust_0618

jiuzhu

master

mulei

ocr

pengjdev

shenzhendev

wangcheng

Mono Color

• 1af66415d6 修复mysql不支持09-31 guoshengxiong 2025-09-04 11:10:37 +08:00
• b2e08bb3fe 去掉spring-boot-admin-starter-client guoshengxiong 2025-09-04 11:10:09 +08:00
• 7a6a3232ea 合并到jdk17分支 guoshengxiong 2025-09-04 10:34:04 +08:00
• bc25c79962 bug修复 mod_security guoshengxiong 2025-09-03 16:47:58 +08:00
• e6deadd6fe bug修复 guoshengxiong 2025-09-02 17:04:35 +08:00
• 016ba73419 Merge branch 'prod' into mod_security guoshengxiong 2025-09-02 13:56:51 +08:00
• 24b469a92b 考勤月报-按单位，最多导出41天 guoshengxiong 2025-09-02 10:48:41 +08:00
• 2be88a032b Exe版本管理 guoshengxiong 2025-09-01 18:06:23 +08:00
• 5b678c3ee1 bug修复和mysql批量替换值 guoshengxiong 2025-08-30 18:12:22 +08:00
• a2ed0c329d Merge branch 'mod_security' into prod guoshengxiong 2025-08-30 17:05:30 +08:00
• a5cc7c8874 bug修复 guoshengxiong 2025-08-30 17:04:09 +08:00
• ab8c736792 扬尘增加蒸发量文档 guoshengxiong 2025-08-29 15:29:18 +08:00
• cdd918d0ef bug修复 guoshengxiong 2025-08-28 16:49:47 +08:00
• 9474d49433 Merge branch 'mod_security' into prod guoshengxiong 2025-08-27 18:23:11 +08:00
• 1bead9cf22 bug修复 guoshengxiong 2025-08-27 18:16:03 +08:00
• afdea2e5bb bug修复 guoshengxiong 2025-08-27 17:47:11 +08:00
• 27182d10cc 青海中水北方修改 pengjie 2025-08-27 15:19:43 +08:00
• 38c35543a0 Merge branch 'mod_security' into prod guoshengxiong 2025-08-26 21:23:12 +08:00
• c9747cfbef bug修复 guoshengxiong 2025-08-26 19:29:39 +08:00
• be575a8270 依赖升级 guoshengxiong 2025-08-26 16:36:35 +08:00
• ffe6fe38a9 bug修复 guoshengxiong 2025-08-26 09:14:03 +08:00
• 328d0371c0 青海中水北方修改 pengjie 2025-08-25 17:26:59 +08:00
• 98858b3b48 Merge remote-tracking branch 'origin/prod' into prod pengjie 2025-08-25 15:32:43 +08:00
• 686420e7d2 青海中水北方修改 pengjie 2025-08-25 15:32:29 +08:00
• 8377079917 查询慢优化 guoshengxiong 2025-08-25 15:12:24 +08:00
• fbf14e2502 查询慢优化 guoshengxiong 2025-08-25 15:12:24 +08:00
• 068ea831ec 依赖升级 guoshengxiong 2025-08-25 13:41:30 +08:00
• ee98e443e9 Merge remote-tracking branch 'origin/prod' into prod pengjie 2025-08-25 11:46:53 +08:00
• 6eb8ccdd72 青海中水北方修改 pengjie 2025-08-25 11:44:27 +08:00
• 2bdd14aec2 bug修复 guoshengxiong 2025-08-22 19:47:15 +08:00
• ca6f3100e1 bug修复 guoshengxiong 2025-08-22 14:39:56 +08:00
• 5b4b8a811c Merge branch 'prod' into mod_security guoshengxiong 2025-08-21 18:56:44 +08:00
• d015d534f1 bug修复 guoshengxiong 2025-08-21 18:53:35 +08:00
• 933f6ebb41 bug修复 guoshengxiong 2025-08-21 17:51:23 +08:00
• e6ae6c94e0 人员退场设置和bug修复 guoshengxiong 2025-08-21 09:21:15 +08:00
• 62498614ae 升级jdk17 guoshengxiong 2025-08-20 16:08:13 +08:00
• 31d2d1bdf2 bug修改 guoshengxiong 2025-08-20 15:28:47 +08:00
• 87b7edc988 升级jdk17 guoshengxiong 2025-08-20 14:07:03 +08:00
• fd4fba18f5 升级jdk17 guoshengxiong 2025-08-19 17:22:36 +08:00
• 7a4acb5a45 智能安全帽人员每日工作统计相关和bug修改 guoshengxiong 2025-08-16 18:21:28 +08:00
• 4ea32fd92d bug修改 guoshengxiong 2025-08-15 18:45:55 +08:00
• 9495b5cb45 劳务管理人员审核通过bug修改 guoshengxiong 2025-08-15 16:46:25 +08:00
• f3320a0587 劳务管理人员审核通过bug修改 guoshengxiong 2025-08-15 16:46:25 +08:00
• af7fb5f8f9 修改bug guoshengxiong 2025-08-15 09:04:14 +08:00
• 933b8012be 修改bug guoshengxiong 2025-08-14 14:45:23 +08:00
• 72d55cd321 扬尘增加蒸发量 guoshengxiong 2025-08-14 10:11:16 +08:00
• 3663e7d5d2 修改bug guoshengxiong 2025-08-14 09:12:17 +08:00
• cfd227d1ef 打印 guoshengxiong 2025-08-13 17:41:38 +08:00
• e0b1e446e6 uat合并prod guoshengxiong 2025-08-13 16:00:38 +08:00
• 4a4409c62e Merge branch 'prod' into uat guoshengxiong 2025-08-13 15:50:38 +08:00
• 4d1938005f 修改bug guoshengxiong 2025-08-13 11:43:40 +08:00
• 0cf0c64722 修改bug guoshengxiong 2025-08-13 11:43:02 +08:00
• 8135452f87 Merge remote-tracking branch 'origin/prod' into prod guoshengxiong 2025-08-12 17:14:07 +08:00
• 5101d248a5 仁智测控转发扬尘Hj212集成 guoshengxiong 2025-08-12 17:14:01 +08:00
• dc37ecc9b2 正赢增加人脸心跳检测 pengjie 2025-08-12 10:55:57 +08:00
• 6ad362778a 正赢增加人脸心跳检测 pengjie 2025-08-12 09:41:20 +08:00
• 8ff888f270 icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间 guoshengxiong 2025-07-23 18:06:33 +08:00
• 58d316bcb9 安全修改bug guoshengxiong 2025-08-08 18:34:14 +08:00
• f6880f49df 配置调整 pengjie 2025-08-08 10:22:37 +08:00
• 5694f0deda 管控清单危险源绑定的的责任区域改成中间表方式 guoshengxiong 2025-08-07 18:02:33 +08:00
• f03f122aac 管控清单危险源绑定的的责任区域改成中间表方式 guoshengxiong 2025-08-07 18:02:33 +08:00
• 0dc7d79eaa 安全bug修复 guoshengxiong 2025-08-07 14:11:29 +08:00
• d87e8aa639 安全隐患检查字段设置配置、隐患统计分析接口 guoshengxiong 2025-08-07 11:34:19 +08:00
• 4ef2006812 配置调整 pengjie 2025-08-07 11:34:56 +08:00
• ecaaf0cdc2 配置调整 pengjie 2025-08-07 11:33:01 +08:00
• b9582da9d9 Merge remote-tracking branch 'origin/mod_security' into mod_security guoshengxiong 2025-08-05 15:31:02 +08:00
• 0b0dfa754b Merge branch 'uat' into mod_security guoshengxiong 2025-08-05 15:23:20 +08:00
• 87ed00d464 SmartJavaAIOcr的bug修改 guoshengxiong 2025-08-05 15:19:38 +08:00
• 73a2fc37b2 SmartJavaAIOrc的bug修改 guoshengxiong 2025-08-05 15:18:40 +08:00
• 1fceef032c 安全检查绑定多选的责任单位和区域、复查人、核验人，隐患统计分析接口 guoshengxiong 2025-08-05 13:55:51 +08:00
• 098bb63b31 执法记录仪设备生成二维码保存格式改成devSn guoshengxiong 2025-08-04 14:22:21 +08:00
• 6652fbeaa6 安全隐患检查字段设置和安全隐患复查核验人设置 guoshengxiong 2025-08-04 11:57:56 +08:00
• 369847e9d3 接入SmartJavaAIOrc guoshengxiong 2025-08-04 11:34:57 +08:00
• 395d2a1617 Merge branch 'ocr' into uat guoshengxiong 2025-08-04 09:30:06 +08:00
• 88a34da4bb 通知提示音信息bug修复 guoshengxiong 2025-08-02 09:16:03 +08:00
• 5d66ddffe9 兼容达梦 dameng guoshengxiong 2025-08-01 18:33:08 +08:00
• b05f69ebca 人脸设备对接 pengjie 2025-07-31 11:07:51 +08:00
• b256bf7729 ocr和施工日志bug修复 ocr guoshengxiong 2025-07-30 15:45:16 +08:00
• e7eef4e308 环境设备10分钟没有接收数据就离线，混凝土拌合站bug修复 guoshengxiong 2025-07-30 15:17:28 +08:00
• ccf93552c0 短信配置 guoshengxiong 2025-07-29 18:17:51 +08:00
• b178980110 ICC的数据校验 guoshengxiong 2025-07-29 10:03:02 +08:00
• 73370c8af0 ocr和施工日志bug修改 guoshengxiong 2025-07-25 18:20:39 +08:00
• 1b0fb0331b ocr和施工日志 guoshengxiong 2025-07-25 18:07:45 +08:00
• 63eea7c798 icc修改bug guoshengxiong 2025-07-25 15:53:00 +08:00
• 0f21141944 icc修改bug guoshengxiong 2025-07-25 15:53:00 +08:00
• abdb7e04c1 查询各个区域下在场人数优化 guoshengxiong 2025-07-25 15:08:42 +08:00
• 33b000f90c map改成对象 guoshengxiong 2025-07-25 15:07:56 +08:00
• 8926a006da map改成对象 guoshengxiong 2025-07-25 15:07:56 +08:00
• d0a5adc391 mcs8的bug修改 guoshengxiong 2025-07-25 10:35:03 +08:00
• fb963c2f56 mcs8的bug修改 guoshengxiong 2025-07-25 10:35:03 +08:00
• 321b5e41a1 Merge branch 'uat' into ocr guoshengxiong 2025-07-25 09:51:08 +08:00
• 60a4832eef icc的错误重试 guoshengxiong 2025-07-25 09:46:49 +08:00
• 3dee4efb53 Merge remote-tracking branch 'origin/uat' into uat guoshengxiong 2025-07-24 18:31:01 +08:00
• 39415752dd 执法记录仪拉取时间更改 guoshengxiong 2025-07-24 18:30:43 +08:00
• ac11217e31 删除多余字段 guoshengxiong 2025-07-24 10:59:01 +08:00
• d187dfe6d8 删除多余字段 guoshengxiong 2025-07-24 10:59:01 +08:00
• 5641225773 Merge branch 'icc' into uat guoshengxiong 2025-07-24 10:35:10 +08:00
• cd4c76a04d mcs8修改bug guoshengxiong 2025-07-24 10:02:42 +08:00
• edcee38819 mcs8修改bug guoshengxiong 2025-07-24 10:02:42 +08:00
• db96864829 mcs8修改bug guoshengxiong 2025-07-24 10:02:42 +08:00