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

• 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
• 87f312ee98 icc的对接bug修改 guoshengxiong 2025-07-24 09:44:58 +08:00
• a2e184116d icc的劳务人员，考勤最后是出场就删除在场记录，考勤最后是入场就更新在场时间 guoshengxiong 2025-07-23 18:06:33 +08:00
• 9003c51453 Merge branch 'uat' into guoshengxiong guoshengxiong guoshengxiong 2025-07-23 15:15:51 +08:00
• c5b1d70097 Merge branch 'xjw_attendance' into uat guoshengxiong 2025-07-23 15:02:15 +08:00
• 97c134b227 Merge branch 'xjw_attendance' into prod guoshengxiong 2025-07-23 14:52:32 +08:00
• 41d32bbda2 管控bug修改 guoshengxiong 2025-07-22 18:08:32 +08:00
• 6e0f08bfa9 人脸设备对接 pengjie 2025-07-21 10:44:43 +08:00
• c04d785c5f 管控bug修改 guoshengxiong 2025-07-21 10:42:03 +08:00
• f394535531 icc的劳务人员对接修改 guoshengxiong 2025-07-19 11:04:52 +08:00
• 19df573b88 管控bug修改 guoshengxiong 2025-07-17 16:02:12 +08:00
• 67855c9ce2 icc的劳务人员和考勤提交 guoshengxiong 2025-07-16 18:10:59 +08:00
• a8b76fd788 icc的劳务人员同步提交 guoshengxiong 2025-07-16 14:27:44 +08:00
• 3212f171f5 定时2分钟获取人员定位标签报警数据任务bug修复 guoshengxiong 2025-07-16 11:40:31 +08:00
• 7dfee323ee 企业大屏配置和修改 guoshengxiong 2025-07-16 09:08:34 +08:00
• 896ff7ba47 icc提交 guoshengxiong 2025-07-15 11:20:42 +08:00
• 7e71847287 弹弓根据勾选设备进行下发 guoshengxiong 2025-07-14 15:08:27 +08:00
• 8d734b46f7 Merge branch 'xjw_attendance' into prod guoshengxiong 2025-07-12 09:56:18 +08:00
• 389ffcd285 中水北方修改 pengjie 2025-07-11 18:18:24 +08:00
• 3a12d05af0 工作票bug修复和批量人员绑定设备 guoshengxiong 2025-07-11 17:28:09 +08:00
• cc6ddce242 中水北方修改 pengjie 2025-07-10 09:43:51 +08:00
• 41b81aa2dd 工作票bug修复 guoshengxiong 2025-07-09 16:29:45 +08:00
• 19ceb728db 工作票bug修复 guoshengxiong 2025-07-09 10:06:07 +08:00
• fe98b1766f 工作票bug修复 guoshengxiong 2025-07-08 10:03:24 +08:00
• c05541f1db 执法记录仪和工作票 guoshengxiong 2025-07-04 14:57:13 +08:00
• 355db840c1 中水北方修改 pengjie 2025-07-05 13:36:05 +08:00
• 3d34bd6dc1 中水北方修改 pengjie 2025-07-05 11:20:58 +08:00
• ce8752b742 中水北方修改 pengjie 2025-07-04 17:45:30 +08:00
• 76136770bc 中水北方修改 pengjie 2025-07-04 17:45:30 +08:00
• d56dbafc14 Merge remote-tracking branch 'origin/uat' into uat pengjie 2025-07-04 17:34:37 +08:00
• 9fc9d4e4ac 芊熠智能bug修复 guoshengxiong 2025-07-03 14:58:45 +08:00
• 84cd5ac420 芊熠智能bug修复 guoshengxiong 2025-07-03 14:58:45 +08:00
• 3cd79fdc81 统计考勤列表bug修复 guoshengxiong 2025-07-03 10:50:17 +08:00
• cd61d61d19 Merge branch 'xjw_attendance' into prod guoshengxiong 2025-07-02 16:24:58 +08:00
• daa3e585ac 增加查询参数 guoshengxiong 2025-07-01 16:01:47 +08:00
• 58faeb161e Merge branch 'prod' into guoshengxiong guoshengxiong 2025-07-01 15:04:18 +08:00
• 0ba2865b17 Merge branch 'xjw_attendance' into prod guoshengxiong 2025-07-01 15:03:50 +08:00
• db34228767 整合扬尘hj212 guoshengxiong 2025-07-01 15:03:04 +08:00
• 121deb6de5 扬尘查询慢修复 guoshengxiong 2025-07-01 13:40:30 +08:00
• 8bfcbfa068 Merge branch 'prod' into guoshengxiong guoshengxiong 2025-07-01 10:02:03 +08:00
• 13cf189faa 黑名单退场bug修复 guoshengxiong 2025-06-30 18:00:17 +08:00
• 6113f6279a 新增黑名单退场、考勤v2bug修复 guoshengxiong 2025-06-30 17:49:54 +08:00
• 8df811c816 Merge branch 'prod' into guoshengxiong guoshengxiong 2025-06-30 15:09:39 +08:00