 zth
|
0795733d1c
|
bug修改
|
2 months ago |
hxh
|
e7bed973ac
|
feat: 查询水库
|
2 months ago |
|
zth
|
0e758aa8ca
|
bug修改
|
2 months ago |
|
zth
|
9428fee130
|
bug修改
|
2 months ago |
|
zth
|
0e00955417
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
|
2 months ago |
|
hxh
|
d1ae41aa96
|
feat: 修改排序规则
|
2 months ago |
|
zth
|
f6c6018b30
|
Merge remote-tracking branch 'origin/release-sy-v1.0.0'
|
2 months ago |
|
hxh
|
2e6052630b
|
feat: 修改排序规则
|
2 months ago |
|
zth
|
a50198ad3f
|
bug修改
|
2 months ago |
|
hxh
|
878b1952ba
|
Merge branch 'master' into release-sy-v1.0.0
|
2 months ago |
|
zth
|
341786b2a0
|
bug修改
|
2 months ago |
ljf
|
522c6a7448
|
bug修改
|
2 months ago |
|
zth
|
085902a92b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java
# shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java
# shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
|
4 months ago |
|
zth
|
5854c25198
|
标牌bug
|
4 months ago |
|
hxh
|
c3c3efd8fc
|
Merge branch 'refs/heads/master' into release-sy-v1.0.0
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
|
4 months ago |
|
hxh
|
cd206d1a9d
|
fix: 代码冲突
|
4 months ago |
|
hxh
|
d7ccf4a863
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
# shuili-system/src/main/java/com/kms/system/service/SysUserService.java
|
4 months ago |
|
zth
|
ba4d61e985
|
管理单位和行政区分
|
4 months ago |
|
hxh
|
c4b00ed036
|
Merge branch 'refs/heads/feature-sk' into release-sy-v1.0.0
|
4 months ago |
|
hxh
|
f23acb19a4
|
Merge branch 'refs/heads/master' into release-sy-v1.0.0
|
4 months ago |
|
hxh
|
21b92394c2
|
fix: 修改字段序列化名字
|
4 months ago |
|
hxh
|
10c17f33c1
|
feat: 完成测点查询接口
|
4 months ago |
|
hxh
|
0413f1a6ba
|
feat: 完成测点查询接口
|
4 months ago |
|
hxh
|
2179f9dd7f
|
fix: 修改树属性名称
|
4 months ago |
|
hxh
|
78c6a10fbc
|
fix: 修复水雨情转换错误
|
4 months ago |
|
hxh
|
4ebd19b257
|
feat: 修改接口url
|
4 months ago |
|
hxh
|
c207381496
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
|
4 months ago |
|
hxh
|
91a4455b6f
|
feat: 修改图标请求参数类型
|
4 months ago |
|
hxh
|
520d3876a9
|
feat: 完善标线逻辑
|
4 months ago |
|
hxh
|
c6674a51fc
|
feat: 完善逻辑
|
4 months ago |
|
hxh
|
59880aaf23
|
feat: 图表获取数据逻辑
|
4 months ago |
|
hxh
|
9673deb101
|
feat: 水雨情逻辑
|
4 months ago |
|
hxh
|
160fde9a2c
|
feat: 水情接口逻辑
|
4 months ago |
|
hxh
|
9a69a4d965
|
feat: 补充告警和规则接口等
|
4 months ago |
|
hxh
|
a065477c7b
|
feat: 监测配置信息
|
4 months ago |
|
hxh
|
602a454900
|
fix: 修复url
|
4 months ago |
|
hxh
|
37b1b12590
|
feat: 更新水利分页查询
|
4 months ago |
|
hxh
|
a96e80c7c8
|
feat: 新接口定义
|
4 months ago |
|
zth
|
d146b8fa3a
|
数据排序
|
4 months ago |
|
hxh
|
77eac8a009
|
Merge branch 'refs/heads/release-sy-v1.0.0' into feature-sk
|
4 months ago |
|
hxh
|
d0359c601a
|
feat: 修改广东省行政规划数据
|
4 months ago |
|
hxh
|
a7aaf7510c
|
fix: 修复字段名
|
4 months ago |
|
hxh
|
5919c7db11
|
feat: 修改广东省行政区划接口
|
4 months ago |
|
hxh
|
f512a2c981
|
Merge branch 'refs/heads/master' into release-sy-v1.0.0
|
4 months ago |
|
hxh
|
12a0425d28
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
|
4 months ago |
|
hxh
|
c44036e2aa
|
feat: 修改广东省行政区划接口
|
4 months ago |
|
hxh
|
1ca7e1e672
|
feat: 添加新监测表
|
4 months ago |
|
zth
|
7d2eb17f69
|
工程规模排序
|
4 months ago |
|
hxh
|
a7ab90ab67
|
fix: 调用大数据平台接口添加异常处理
|
4 months ago |
|
hxh
|
481822bd8e
|
fix: 修复表名
|
4 months ago |
