yang_shj
|
7e9d0db0bf
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
yang_shj
|
9944bd384b
|
#视频播放功能
|
4 months ago |
luyie
|
8b14fb1fc2
|
add:智谱分析,增加结果解析
|
4 months ago |
haungxing
|
88b1ecc2b8
|
add: 海康摄像头截图上传minio工具类
|
4 months ago |
haungxing
|
34858782f7
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
# Conflicts:
# hzims-service/hzims-big-model/src/main/resources/template/template.yml
|
4 months ago |
haungxing
|
115f0e52b5
|
add: 数据库维护配置
|
4 months ago |
liwen
|
7d9690fc60
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
4 months ago |
liwen
|
4cfbbdda45
|
update: 安全工器具类型优化
|
4 months ago |
luyie
|
a044293217
|
add:修改配置模版文件,添加大模型配置
|
4 months ago |
haungxing
|
97564777c6
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
haungxing
|
fd4dea2701
|
add: 大模型swagger配置
|
4 months ago |
liwen
|
daa880ea8a
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
liwen
|
62add639e7
|
update: 安全工器具类型优化
|
4 months ago |
luyie
|
997d3e2b2c
|
add:智谱对接增加数据,调试
|
4 months ago |
liwen
|
8432640f2e
|
Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3
|
4 months ago |
liwen
|
242fc8195e
|
update: 安全工器具类型新增机构字段
|
4 months ago |
luyie
|
be39e6f21b
|
add:调整逻辑,兼容文件与url,增加配置信息的管理
|
4 months ago |
luyie
|
b00c9d2254
|
add:大模型feign接口
|
4 months ago |
luyie
|
39af876ab1
|
fix:删除多余提交
|
4 months ago |
luyie
|
dc0bd08cb8
|
add:智谱大模型对接
|
4 months ago |
yang_shj
|
b542238a02
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
yang_shj
|
982f4b50db
|
#集团电量报表
|
4 months ago |
haungxing
|
1ef7c3070c
|
fix: 视频数据同步向量数据库
|
4 months ago |
haungxing
|
2a0bd04bf5
|
fix: 解决风险排查查询报错问题
|
4 months ago |
ty
|
7aae190cca
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
yang_shj
|
e0fd05cef1
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
yang_shj
|
ba9d530715
|
#分析数据功能
|
4 months ago |
ty
|
f36a452424
|
修正:风险排查流程bug
|
4 months ago |
ty
|
e9659cf247
|
增加fdp历史状态图的注释
|
4 months ago |
yang_shj
|
0a6c8d6d43
|
#任务阻塞导致线程重复创建
|
4 months ago |
yang_shj
|
0952830d01
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
yang_shj
|
68ac4c613d
|
#电量报表功能
|
4 months ago |
haungxing
|
e229c4de91
|
fix: 大模型简称重命名
|
4 months ago |
haungxing
|
af75e80563
|
fix: 大模型简称重命名
|
4 months ago |
ty
|
03abcb90f9
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
ty
|
6266b924a4
|
修正:巡检提前30分钟提醒
|
4 months ago |
ty
|
66aa807444
|
修正:物品类别台账导入
|
4 months ago |
haungxing
|
ebbb029582
|
fix: 车辆台账年检时间格式化
|
4 months ago |
haungxing
|
961afa2565
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
haungxing
|
164cfb21ff
|
fix: 车辆台账年检时间格式化
|
4 months ago |
Jone
|
bcce380d27
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
Jone
|
72e7b5e76c
|
修复不规范的代码
|
4 months ago |
haungxing
|
e000daa790
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
haungxing
|
09352a6ccc
|
fix: 合并master分支
|
4 months ago |
haungxing
|
e3313a099a
|
fix: 合并master分支
|
4 months ago |
ty
|
8a578ae500
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
ty
|
74f119bfdf
|
修复:巡检任务统计保留两位小数
|
4 months ago |
yang_shj
|
d232690c38
|
#风险评估默认状态
|
4 months ago |
yang_shj
|
b1f05edd5e
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
yang_shj
|
93c13d394c
|
#日志打印修改
|
4 months ago |