Commit Graph

  • f41ce2512e Merge remote-tracking branch 'origin/0205cmt' into 0205cmt 0205cmt zhaohongyu 2024-12-17 09:10:36 +0800
  • 46b7c61056 feat:测试推送代码 dearLin 2024-12-17 09:10:18 +0800
  • a9e8d3b090 2024/12/13 增加筛选条件 zhaohongyu 2024-12-13 17:56:17 +0800
  • 1f0083d851 2024/12/13 增加筛选条件 zhaohongyu 2024-12-13 17:53:34 +0800
  • ef22ca6c04 2024/12/13 动火增加时间筛选 zhaohongyu 2024-12-13 16:29:48 +0800
  • 82e9cd2d33 2024/12/13 在添加消防设备栏 添加负责部门选项或者搜索部门关键词 zhaohongyu 2024-12-13 15:41:12 +0800
  • e4aaa14a6a 2024/12/13 曹煤炭清单管理增加隐患级别搜索条件 zhaohongyu 2024-12-13 15:10:34 +0800
  • 256ccee8f0 Merge remote-tracking branch 'origin/0205cmt' into 0205cmt dearLin 2024-12-13 13:50:53 +0800
  • f7177dd91d feat:八项作业撤回上一步 0927cmt dearLin 2024-12-13 13:50:03 +0800
  • 5a81340b6b 回退更改 并改为LIMIT 1 zhaoyu 2024-10-30 10:43:16 +0800
  • 52b45f1558 获取时间对应不上 改为获取当前时间 zhaoyu 2024-10-30 10:39:54 +0800
  • 6e04d3fc2e 修复短信提示密码错误 dev-shanao shanao 2024-10-25 10:58:21 +0800
  • 8acb809c3c 完善备注和发送站内信 shanao 2024-10-25 09:52:06 +0800
  • 93801a5250 封装自定义短信发送 shanao 2024-10-25 09:00:33 +0800
  • 73500df19d 完成短信/站内信推送 shanao 2024-10-24 18:23:38 +0800
  • d04a9074b3 修复安全环保检查检查情况搜索框不好使的问题 dev shanao 2024-10-23 20:50:47 +0800
  • 13261734e6 Merge remote-tracking branch 'origin/dev' into dev shanao 2024-10-23 19:48:54 +0800
  • 26c7f9483f [新增功能](pet) 升级hutool版本 huangyuxuan 2024-10-23 19:47:44 +0800
  • 0921161d64 修复安全环保检查loginUserId为空导致mybatis 错误的问题 pet shanao 2024-10-23 19:31:25 +0800
  • 162b25bb87 修复MD5 shanao 2024-10-23 17:24:25 +0800
  • 87520d5b8f Merge remote-tracking branch 'origin/pet' into pet huangyuxuan 2024-10-23 14:32:20 +0800
  • 080f8b1fae [新增功能](pet) 取消 人员信息修改时需要手动推送(信息修改后中台自动同步到各端) huangyuxuan 2024-10-23 14:32:12 +0800
  • 877b518e5d Merge remote-tracking branch 'origin/dev-shanao' into pet shanao 2024-10-23 14:21:23 +0800
  • 38986c3364 1111111 shanao 2024-10-19 17:34:40 +0800
  • 9e089fcb62 1111111 shanao 2024-10-15 18:13:26 +0800
  • 0698b28d27 添加隐患处理类型等接口 shanao 2024-09-30 14:46:38 +0800
  • 183eef7073 将事故事件分离开 shanao 2024-09-27 18:07:34 +0800
  • c2c3897979 封装数据发送(九公司消息发送) shanao 2024-10-23 14:16:31 +0800
  • 1a26abd93a 封装数据发送(九公司消息发送) shanao 2024-10-21 18:26:02 +0800
  • 80f4b403f3 Merge remote-tracking branch 'origin/pet' into dev-shanao shanao 2024-10-21 10:51:07 +0800
  • 93e034b162 Merge branch 'refs/heads/hyx_2024-9-27_tongbu' into pet huangyuxuan 2024-10-21 09:23:22 +0800
  • 059e316156 [新增功能](hyx_2024-9-27_tongbu) hyx_2024-9-27_tongbu huangyuxuan 2024-10-21 08:48:15 +0800
  • 3711239f55 1111111 shanao 2024-10-19 17:34:40 +0800
  • 34509e2db4 [新增功能](hyx_2024-10-12_xgfPerson) - 修改相关方人员培训流程 hyx_2024-10-12_xgfPerson huangyuxuan 2024-10-19 10:18:58 +0800
  • 6111c30c7a 1111111 shanao 2024-10-15 18:13:26 +0800
  • f741535420 [新增功能](hyx_2024-9-27_tongbu) 人员信息同步 huangyuxuan 2024-10-12 08:56:20 +0800
  • 0ec51c4702 Merge remote-tracking branch 'origin/dev' into dev-shanao shanao 2024-10-08 16:27:56 +0800
  • 029399c877 新增隐患处理等接口 shanao 2024-09-30 15:33:42 +0800
  • bd1690cea5 添加隐患处理类型等接口 shanao 2024-09-30 14:46:38 +0800
  • 8a1947dbd3 Merge remote-tracking branch 'refs/remotes/origin/pet' into dev-shanao shanao 2024-09-30 14:14:20 +0800
  • b5f7a5fede 将事故事件分离开 shanao 2024-09-27 18:07:34 +0800
  • 05a14e2efc feat:八项作业撤回上一步 dearLin 2024-09-27 14:24:12 +0800
  • 6050e94b49 datalistPageV3回退 huangyuxuan 2024-09-24 18:30:22 +0800
  • f7cc015363 Merge branch 'pet' into dev huangyuxuan 2024-09-24 18:20:18 +0800
  • 13448e2af1 菜单回退 huangyuxuan 2024-09-24 18:19:25 +0800
  • 432d02c430 删除多次提交的代码 huangyuxuan 2024-09-24 17:37:09 +0800
  • c96c1d60a9 代码版本回退 huangyuxuan 2024-09-20 16:54:43 +0800
  • 1ad76f6a87 代码版本回退 huangyuxuan 2024-09-20 16:53:36 +0800
  • f3b7639fcf Merge branch 'hyx_changeFileUpload_2024-9-10' into pet huangyuxuan 2024-09-20 16:48:04 +0800
  • 5d728f4d16 Merge remote-tracking branch 'origin/pet' into pet huangyuxuan 2024-09-19 14:37:03 +0800
  • 876b63f0e6 [新增功能](hyx_changeFileUpload_2024-9-10) ClearFilesJob.java - 定时任务改为每日清理30天前的临时文件 DateUtil.java - 新增 获取30天之前的日期字符串 方法 hyx_changeFileUpload_2024-9-10 huangyuxuan 2024-09-19 14:36:11 +0800
  • 785cb0b4e9 [新增功能](hyx_changeFileUpload_2024-9-10) - AppSystemController.java - 延时监火任务转发下拉选择部门时不选择主企业 - CheckRecordMapper.xml - ListManagerMapper.xml - 查询 USER_NAME 时 调用 getUnameByUid函数 - StatisticsDataController.java - 数据大屏,首页接口不登陆访问 huangyuxuan 2024-09-19 10:02:54 +0800
  • 3fdd6ee1e6 测试环境配置文件更新 water_xu 2024-09-19 09:06:05 +0800
  • bd4185fcb7 1.消防检查二维码 guoyuepeng 2024-09-19 08:46:49 +0800
  • 25752ec5ef 死亡人数 shanao 2024-09-14 22:11:16 +0800
  • d39cf3da87 修复时间相差8小时的问题 shanao 2024-09-14 21:15:25 +0800
  • 39f19b3526 修改时间类型 shanao 2024-09-14 20:41:30 +0800
  • cbd2c424dc 修改更改 shanao 2024-09-14 20:17:18 +0800
  • e61cb0b9ea 修改更改 shanao 2024-09-14 19:59:53 +0800
  • 415bfd3086 修复对象转换问题 shanao 2024-09-14 19:43:49 +0800
  • e932aacc86 菜单恢复 water_xu 2024-09-14 17:05:11 +0800
  • 32899c9531 菜单表恢复 WenShiJun 2024-09-14 16:59:52 +0800
  • c2068c6ebd 消防安全管理添加扫码查看检查记录更新 WenShiJun 2024-09-14 16:50:01 +0800
  • 9169d4c15e Merge branch 'refs/heads/pet' into dev water_xu 2024-09-14 16:34:08 +0800
  • b8dec5280c Merge remote-tracking branch 'origin/dev-shanao' into dev shanao 2024-09-14 10:48:53 +0800
  • bc8002876b 消防安全管理添加扫码查看检查记录 WenShiJun 2024-09-14 09:50:07 +0800
  • a455293431 Merge remote-tracking branch 'origin/dev-shanao' into pet shanao 2024-09-13 17:47:35 +0800
  • eb37f788a7 测试完成 shanao 2024-09-13 17:19:33 +0800
  • 69a359ded8 修复完所有问题 shanao 2024-09-12 14:46:20 +0800
  • b7b228f4b6 1.企业端移植门口门禁和人员定位系统 guoyuepeng 2024-09-11 17:33:07 +0800
  • b319779e4e 回滚中台相关代码 删除Json工具类报错 water_xu 2024-09-11 09:50:13 +0800
  • 7925ea2a61 回滚中台相关代码 water_xu 2024-09-10 19:54:59 +0800
  • dc0e4f4374 中台ISPUSH默认值为0 water_xu 2024-09-10 18:17:56 +0800
  • 2b383e1364 修复导出相关问题 shanao 2024-09-10 18:09:40 +0800
  • a24771a505 [新增功能](hyx_changeFileUpload_2024-9-10) ClearFilesJob.java - 定时清除临时文件任务 FileUploadUtil.java - 上传文件到服务器临时地址 - 临时文件拷贝到正式 MfolderController.java - 未完成 huangyuxuan 2024-09-10 17:52:05 +0800
  • 7e2077cc48 Merge branch 'refs/heads/pet-图片单独上传接口-2024.8.28-徐绎丰' into dev water_xu 2024-09-10 17:08:13 +0800
  • 2e517e44a3 暂时回滚人员中台相关代码 dev-9.10-修复中台bug-xuyifeng water_xu 2024-09-10 16:51:54 +0800
  • 1cb6ce1c95 Revert "人员中台 - 人员初始化相关接口" water_xu 2024-09-10 15:38:03 +0800
  • dceba5c4b2 修复导出相关问题 shanao 2024-09-10 14:10:42 +0800
  • 683a6be69e 显示监管端上传的体系文件 huangyuxuan 2024-09-10 11:47:12 +0800
  • c6ea9844ca 修改图片上传方式为Sftp 导出没有调通 shanao 2024-09-09 18:05:42 +0800
  • 5197b10d4e 调试 shanao 2024-09-08 22:06:08 +0800
  • a5b76b25df 优化批量提交 shanao 2024-09-06 19:38:32 +0800
  • 6e9a25d7f4 Merge branch 'refs/heads/pet' into dev water_xu 2024-09-05 18:27:16 +0800
  • 69a94ef6cc Merge remote-tracking branch 'origin/pet' into pet water_xu 2024-09-05 14:03:38 +0800
  • b1a8a3b86f 弃用阿里JsonUtil 出了个bug water_xu 2024-09-05 14:03:28 +0800
  • 7a7a948915 Merge remote-tracking branch 'origin/pet' into pet huangyuxuan 2024-09-05 13:56:39 +0800
  • 1d66e96757 修复不兼容阿里JSONUtil huangyuxuan 2024-09-05 13:51:14 +0800
  • 8e3a6d7615 相关方 - 新增河港城发集团单位的培训流程 water_xu 2024-09-05 13:46:30 +0800
  • 5897896094 Merge remote-tracking branch 'origin/pet' into pet huangyuxuan 2024-09-05 11:38:12 +0800
  • 3dfa30514b 人员中台 - 收到数据时不修改本地表 water_xu 2024-09-05 11:33:24 +0800
  • f629b35351 消防点位管理模块检查记录二维码功能修改 WenShiJun 2024-09-05 09:25:02 +0800
  • 439eb4fdb0 恢复菜单 water_xu 2024-09-04 20:42:01 +0800
  • 370adafd23 人员中台 - 配置更新 water_xu 2024-09-04 20:30:21 +0800
  • 26f7bce7a8 附件服务器配置更新 water_xu 2024-09-04 20:23:29 +0800
  • b3ec041f58 人员中台 - 人员初始化相关接口 water_xu 2024-09-04 16:20:02 +0800
  • 6ff7afb927 弃用阿里JsonUtil 出了个bug water_xu 2024-09-04 16:17:13 +0800
  • 14adffe1e3 人员定位相关对接功能 water_xu 2024-09-04 16:16:35 +0800
  • db8a7b76be 1.八项作业强制回档 guoyuepeng 2024-09-04 11:24:37 +0800
  • 83487f4028 消防安全管理添加扫码查看检查记录 WenShiJun 2024-09-03 18:08:40 +0800