 shanao
|
6e04d3fc2e
|
修复短信提示密码错误
|
2024-10-25 10:58:21 +08:00 |
|
shanao
|
8acb809c3c
|
完善备注和发送站内信
|
2024-10-25 09:52:06 +08:00 |
|
shanao
|
93801a5250
|
封装自定义短信发送
|
2024-10-25 09:00:33 +08:00 |
|
shanao
|
73500df19d
|
完成短信/站内信推送
|
2024-10-24 18:23:38 +08:00 |
|
shanao
|
d04a9074b3
|
修复安全环保检查检查情况搜索框不好使的问题
|
2024-10-23 20:50:47 +08:00 |
|
shanao
|
13261734e6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-23 19:48:54 +08:00 |
 huangyuxuan
|
26c7f9483f
|
[新增功能](pet)
升级hutool版本
|
2024-10-23 19:47:44 +08:00 |
|
shanao
|
0921161d64
|
修复安全环保检查loginUserId为空导致mybatis 错误的问题
|
2024-10-23 19:31:25 +08:00 |
|
shanao
|
162b25bb87
|
修复MD5
|
2024-10-23 17:24:25 +08:00 |
|
huangyuxuan
|
87520d5b8f
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-10-23 14:32:20 +08:00 |
|
huangyuxuan
|
080f8b1fae
|
[新增功能](pet)
取消 人员信息修改时需要手动推送(信息修改后中台自动同步到各端)
|
2024-10-23 14:32:12 +08:00 |
|
shanao
|
877b518e5d
|
Merge remote-tracking branch 'origin/dev-shanao' into pet
# Conflicts:
# src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java
# src/main/java/com/zcloud/controller/messages/MessagesController.java
# src/main/java/com/zcloud/entity/messages/PushRecords.java
# src/main/java/com/zcloud/mapper/datasource/messages/MessagesMapper.java
# src/main/java/com/zcloud/service/messages/impl/MessagesServiceImpl.java
# src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml
# src/main/resources/mybatis/datasource/messages/MessagesMapper.xml
|
2024-10-23 14:21:23 +08:00 |
|
shanao
|
38986c3364
|
1111111
|
2024-10-23 14:18:28 +08:00 |
|
shanao
|
9e089fcb62
|
1111111
|
2024-10-23 14:18:27 +08:00 |
|
shanao
|
0698b28d27
|
添加隐患处理类型等接口
|
2024-10-23 14:18:26 +08:00 |
|
shanao
|
183eef7073
|
将事故事件分离开
|
2024-10-23 14:18:18 +08:00 |
|
shanao
|
c2c3897979
|
封装数据发送（九公司消息发送）
|
2024-10-23 14:16:31 +08:00 |
|
shanao
|
1a26abd93a
|
封装数据发送（九公司消息发送）
|
2024-10-21 18:26:02 +08:00 |
|
shanao
|
80f4b403f3
|
Merge remote-tracking branch 'origin/pet' into dev-shanao
|
2024-10-21 10:51:07 +08:00 |
|
huangyuxuan
|
93e034b162
|
Merge branch 'refs/heads/hyx_2024-9-27_tongbu' into pet
|
2024-10-21 09:23:22 +08:00 |
|
huangyuxuan
|
059e316156
|
[新增功能](hyx_2024-9-27_tongbu)
|
2024-10-21 08:48:15 +08:00 |
|
shanao
|
3711239f55
|
1111111
|
2024-10-19 17:34:40 +08:00 |
|
shanao
|
6111c30c7a
|
1111111
|
2024-10-15 18:13:26 +08:00 |
|
huangyuxuan
|
f741535420
|
[新增功能](hyx_2024-9-27_tongbu)
人员信息同步
|
2024-10-12 08:56:20 +08:00 |
|
shanao
|
0ec51c4702
|
Merge remote-tracking branch 'origin/dev' into dev-shanao
# Conflicts:
# src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java
# src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java
|
2024-10-08 16:27:56 +08:00 |
|
shanao
|
029399c877
|
新增隐患处理等接口
|
2024-09-30 15:33:42 +08:00 |
|
shanao
|
bd1690cea5
|
添加隐患处理类型等接口
|
2024-09-30 14:46:38 +08:00 |
|
shanao
|
8a1947dbd3
|
Merge remote-tracking branch 'refs/remotes/origin/pet' into dev-shanao
|
2024-09-30 14:14:20 +08:00 |
|
shanao
|
b5f7a5fede
|
将事故事件分离开
|
2024-09-27 18:07:34 +08:00 |
|
huangyuxuan
|
6050e94b49
|
datalistPageV3回退
|
2024-09-24 18:30:22 +08:00 |
|
huangyuxuan
|
f7cc015363
|
Merge branch 'pet' into dev
# Conflicts:
# src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
|
2024-09-24 18:20:18 +08:00 |
|
huangyuxuan
|
13448e2af1
|
菜单回退
|
2024-09-24 18:19:25 +08:00 |
|
huangyuxuan
|
432d02c430
|
删除多次提交的代码
|
2024-09-24 17:37:09 +08:00 |
|
huangyuxuan
|
c96c1d60a9
|
代码版本回退
|
2024-09-20 16:54:43 +08:00 |
|
huangyuxuan
|
1ad76f6a87
|
代码版本回退
|
2024-09-20 16:53:36 +08:00 |
|
huangyuxuan
|
f3b7639fcf
|
Merge branch 'hyx_changeFileUpload_2024-9-10' into pet
# Conflicts:
# src/main/java/com/zcloud/controller/filemanager/MfolderController.java
# src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
# src/main/java/com/zcloud/util/Const.java
|
2024-09-20 16:48:04 +08:00 |
|
huangyuxuan
|
5d728f4d16
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-19 14:37:03 +08:00 |
|
huangyuxuan
|
876b63f0e6
|
[新增功能](hyx_changeFileUpload_2024-9-10)
ClearFilesJob.java
- 定时任务改为每日清理30天前的临时文件
DateUtil.java
- 新增 获取30天之前的日期字符串 方法
|
2024-09-19 14:36:11 +08:00 |
|
huangyuxuan
|
785cb0b4e9
|
[新增功能](hyx_changeFileUpload_2024-9-10)
- AppSystemController.java
- 延时监火任务转发下拉选择部门时不选择主企业
- CheckRecordMapper.xml
- ListManagerMapper.xml
- 查询 USER_NAME 时 调用 getUnameByUid函数
- StatisticsDataController.java
- 数据大屏，首页接口不登陆访问
|
2024-09-19 10:02:54 +08:00 |
water_xu
|
3fdd6ee1e6
|
测试环境配置文件更新
|
2024-09-19 09:06:05 +08:00 |
guoyuepeng
|
bd4185fcb7
|
1.消防检查二维码
|
2024-09-19 08:46:49 +08:00 |
|
shanao
|
25752ec5ef
|
死亡人数
|
2024-09-14 22:11:16 +08:00 |
|
shanao
|
d39cf3da87
|
修复时间相差8小时的问题
|
2024-09-14 21:15:25 +08:00 |
|
shanao
|
39f19b3526
|
修改时间类型
|
2024-09-14 20:41:30 +08:00 |
|
shanao
|
cbd2c424dc
|
修改更改
|
2024-09-14 20:17:18 +08:00 |
|
shanao
|
e61cb0b9ea
|
修改更改
|
2024-09-14 19:59:53 +08:00 |
|
shanao
|
415bfd3086
|
修复对象转换问题
|
2024-09-14 19:43:49 +08:00 |
|
water_xu
|
e932aacc86
|
菜单恢复
|
2024-09-14 17:05:11 +08:00 |
WenShiJun
|
32899c9531
|
菜单表恢复
|
2024-09-14 16:59:52 +08:00 |
|
WenShiJun
|
c2068c6ebd
|
消防安全管理添加扫码查看检查记录更新
|
2024-09-14 16:50:01 +08:00 |