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

• 84c3ff4542 机械设备导入导出 guoshengxiong 2025-10-10 17:21:10 +08:00
• 2227f942bf 规范添加安全检查记录信息时间 guoshengxiong 2025-10-10 17:00:19 +08:00
• 54851acfe2 删除安全检查记录信息优化 guoshengxiong 2025-10-10 15:16:43 +08:00
• 25f564b2b7 隐患工单派发生成隐患单去重 guoshengxiong 2025-10-10 13:59:13 +08:00
• 8b1fd8996e 批量删除执法记录仪设备修复 guoshengxiong 2025-10-10 13:58:31 +08:00
• b851bebabc 执法记录仪视频配置null修复 guoshengxiong 2025-10-09 17:56:18 +08:00
• a9955d50b5 工作票null修复 guoshengxiong 2025-10-09 17:55:50 +08:00
• 296bafed19 devSn不能是eq guoshengxiong 2025-09-30 19:11:10 +08:00
• d1f2ac63be devSn不能是eq guoshengxiong 2025-09-30 19:11:10 +08:00
• 5d3516837f Merge branch 'uat' into dunhuang guoshengxiong 2025-09-30 18:04:29 +08:00
• f69964d66d 上传bug修改 guoshengxiong 2025-09-30 18:02:55 +08:00
• 1115dcd968 合并升级jdk17语法 guoshengxiong 2025-09-30 17:57:25 +08:00
• 934b6633b9 合并uat冲突修改 guoshengxiong 2025-09-30 17:27:46 +08:00
• 6bf66b867e Merge branch 'uat' into dunhuang guoshengxiong 2025-09-30 17:16:55 +08:00
• ff4d31c0e2 工单等bug优化 guoshengxiong 2025-09-30 17:15:17 +08:00
• d617e8c499 machine_device提交 guoshengxiong 2025-09-30 17:13:05 +08:00
• 8786b8302e bigdanger修复 guoshengxiong 2025-09-30 17:12:42 +08:00
• e06cef4d70 合并uat冲突修改 guoshengxiong 2025-09-30 09:18:49 +08:00
• 3d7a9774dc Merge branch 'uat' into dunhuang guoshengxiong 2025-09-30 09:10:27 +08:00
• 64b89dc734 合并uat的执法记录仪导出 guoshengxiong 2025-09-25 10:35:29 +08:00
• 4e3fefa0f4 工单优化 guoshengxiong 2025-09-29 17:54:58 +08:00
• 7fc738861f 工单优化 guoshengxiong 2025-09-29 17:54:58 +08:00
• 5441abe588 修改工单bug guoshengxiong 2025-09-29 17:23:31 +08:00
• e0eac7bfd2 增加工单等其他bug guoshengxiong 2025-09-29 17:27:03 +08:00
• 98791b9d6c 登录改成数字验证码等其他修复 guoshengxiong 2025-09-29 17:23:31 +08:00
• 770cdef165 同步isc的bug修复 guoshengxiong 2025-09-29 17:08:25 +08:00
• abb64f8d92 增加工单等其他bug guoshengxiong 2025-09-28 18:36:59 +08:00
• c2a40ef078 《通过http下载文件，并修改名称》处理重复的后缀 guoshengxiong 2025-09-27 16:45:57 +08:00
• 1e38b52511 《通过http下载文件，并修改名称》处理重复的后缀 guoshengxiong 2025-09-27 16:45:57 +08:00
• cbc62ead1c 是否启用无插件播放 guoshengxiong 2025-09-22 18:42:21 +08:00
• 9f7f5c3632 监控导入不要parentObj guoshengxiong 2025-09-27 09:22:27 +08:00
• 3cca4e4a1c 监控导入不要parentObj guoshengxiong 2025-09-27 09:22:27 +08:00
• b7a3e9ff46 监控导入设备重名更新 guoshengxiong 2025-09-26 19:24:44 +08:00
• 1e952f6993 监控导入设备重名更新 guoshengxiong 2025-09-26 19:24:44 +08:00
• c7fa730509 监控导入设备重名更新 guoshengxiong 2025-09-26 19:16:25 +08:00
• 7018348d79 监控导入设备重名更新 guoshengxiong 2025-09-26 19:16:25 +08:00
• eeeb7cb62e 添加项目bug修改 guoshengxiong 2025-09-26 18:27:42 +08:00
• 6de1f82747 《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换 guoshengxiong 2025-09-26 18:29:54 +08:00
• cb497f1e6c 添加项目bug修改 guoshengxiong 2025-09-26 18:27:42 +08:00
• 76bbce23bc 《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换 guoshengxiong 2025-09-26 18:26:18 +08:00
• bbfa43e521 新危大工程 guoshengxiong 2025-09-26 16:14:52 +08:00
• d99914d445 新危大工程 guoshengxiong 2025-09-26 16:13:33 +08:00
• 316f7f45e3 执法记录仪导出 guoshengxiong 2025-09-25 10:38:13 +08:00
• 7340d99c2c 执法记录仪导出 guoshengxiong 2025-09-25 10:37:26 +08:00
• aa429808d5 执法记录仪导出 guoshengxiong 2025-09-25 10:35:29 +08:00
• a24cbd89ba 导出图片到excel bug修复 guoshengxiong 2025-09-25 10:32:31 +08:00
• bc06c9daa1 是否启用无插件播放 guoshengxiong 2025-09-22 18:42:21 +08:00
• 0560157c45 Merge branch 'uat' into dunhuang guoshengxiong 2025-09-22 18:36:45 +08:00
• e60344e802 批量删除执法记录仪文件信息等修复 guoshengxiong 2025-09-19 19:44:03 +08:00
• 400f5ee2a6 批量删除执法记录仪文件信息等修复 guoshengxiong 2025-09-19 19:32:11 +08:00
• 7b3b14f889 批量删除执法记录仪文件信息等修复 guoshengxiong 2025-09-19 19:32:11 +08:00
• 43ad1fc4db mcs8下载选择的是http内网、外网 guoshengxiong 2025-09-19 16:49:04 +08:00
• 2a2e42fe5e 企业视频增加分组 guoshengxiong 2025-09-19 16:47:58 +08:00
• f2f27114a8 mcs8下载选择的是http内网、外网 guoshengxiong 2025-09-19 16:49:04 +08:00
• 9d32aacaf5 企业视频增加分组 guoshengxiong 2025-09-19 16:47:58 +08:00
• c7668679fa 合并分支修改 guoshengxiong 2025-09-19 09:18:36 +08:00
• 5d71396465 Merge branch 'uat' into dunhuang guoshengxiong 2025-09-19 09:12:33 +08:00
• 85ab953526 加上apk guoshengxiong 2025-09-19 09:04:55 +08:00
• 3ea38f4805 bug修复 guoshengxiong 2025-09-18 18:39:42 +08:00
• 1f02242018 四色图接口 guoshengxiong 2025-09-18 18:39:04 +08:00
• 9945b42b9c in权限bug修复 guoshengxiong 2025-09-18 18:06:17 +08:00
• c01312e639 定时删除临时旧文件 guoshengxiong 2025-09-17 14:36:16 +08:00
• bd2caa24da 定时删除临时旧文件 guoshengxiong 2025-09-17 14:29:56 +08:00
• d774589549 mcu8的token失败重试 guoshengxiong 2025-09-17 11:38:29 +08:00
• dcb707708d 合并管理员权限bug修复 guoshengxiong 2025-09-17 13:41:02 +08:00
• c08de3102b 管理员权限bug修复 guoshengxiong 2025-09-17 13:41:02 +08:00
• 1c5e568e5b mcu8的token失败重试 guoshengxiong 2025-09-17 11:38:29 +08:00
• 46317684a3 桥机修复 guoshengxiong 2025-09-16 10:34:35 +08:00
• 004a5f4844 WorkTicketType权限修复 guoshengxiong 2025-09-16 10:00:27 +08:00
• 9011dd884b 登录bug修复 guoshengxiong 2025-09-15 10:25:04 +08:00
• 4d41de5d08 登录bug修复 guoshengxiong 2025-09-15 10:25:04 +08:00
• 2a0fb4bfd7 提交桥机接口 guoshengxiong 2025-09-15 09:19:05 +08:00
• b3590f3194 提交桥机工作循环数据文档 guoshengxiong 2025-09-13 16:41:16 +08:00
• 4b48f4ed9e 修改jeecg生成代码模版 guoshengxiong 2025-09-13 13:55:37 +08:00
• b4f248d7a3 项目数据权限 guoshengxiong 2025-09-13 10:24:05 +08:00
• 5a2bcda4a6 合并uat到敦煌的冲突解决 guoshengxiong 2025-09-12 16:51:04 +08:00
• 52ab3f4a38 合并uat到敦煌的冲突解决 hole_jdk17 guoshengxiong 2025-09-12 16:44:08 +08:00
• 9121461a3a Merge branch 'uat' into dunhuang guoshengxiong 2025-09-12 16:18:38 +08:00
• dd2b19626c 优化权限 guoshengxiong 2025-09-12 14:29:08 +08:00
• bd1c89670a 优化权限 guoshengxiong 2025-09-12 13:41:52 +08:00
• 2316971b56 优化权限和bug修复 guoshengxiong 2025-09-11 11:18:30 +08:00
• 70dfe3dbe9 脱敏处理 guoshengxiong 2025-09-11 11:18:53 +08:00
• d69bdf3bbc 优化权限和bug修复 guoshengxiong 2025-09-11 11:18:30 +08:00
• b214faacd6 优化权限和bug修复 guoshengxiong 2025-09-10 20:26:17 +08:00
• 9e49c6f7bc 优化权限和bug修复 guoshengxiong 2025-09-10 20:26:17 +08:00
• 5fd01c5bb5 导入劳务人员bug修复 guoshengxiong 2025-09-10 10:24:42 +08:00
• 2c6823552e 导入劳务人员bug修复 guoshengxiong 2025-09-10 10:24:21 +08:00
• 252a1409fc 脱敏处理 guoshengxiong 2025-09-09 18:32:45 +08:00
• 642cb0d61e 优化权限和上传文件等1 guoshengxiong 2025-09-09 17:55:41 +08:00
• 93854ec29f 脱敏处理 desensitize guoshengxiong 2025-09-09 18:32:45 +08:00
• eb4823bf5a 优化权限和上传文件等 guoshengxiong 2025-09-09 17:55:41 +08:00
• 46e05204df 导入excel修改bug guoshengxiong 2025-09-09 17:44:43 +08:00
• fc1c57457e 优化狮子王接口 guoshengxiong 2025-09-09 11:19:08 +08:00
• 48f41ef72a 广播和视频分组导入 guoshengxiong 2025-09-08 17:04:43 +08:00
• bf9c3c2ec1 FastJSON漏洞修复 guoshengxiong 2025-09-08 14:31:12 +08:00
• 7aa4d307e7 转换Base64到webp格式和bug修复 prod guoshengxiong 2025-09-05 17:47:33 +08:00
• b679c12c48 bug修复 guoshengxiong 2025-09-05 11:39:47 +08:00
• 8f7a2c206e bug修复 guoshengxiong 2025-09-05 11:29:57 +08:00
• d407d558af 广播接口和bug修复 guoshengxiong 2025-09-04 17:58:29 +08:00
• 05da654a32 ocr施工日志施工单位权限bug修复 guoshengxiong 2025-09-04 14:35:30 +08:00