hxh
|
c207381496
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
|
4 months ago |
 zth
|
d146b8fa3a
|
数据排序
|
4 months ago |
|
hxh
|
12a0425d28
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
|
4 months ago |
|
zth
|
7d2eb17f69
|
工程规模排序
|
4 months ago |
|
hxh
|
382f919bd8
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
# Conflicts:
# shuili-common/pom.xml
|
4 months ago |
|
zth
|
dfa9f67123
|
行政区划
|
4 months ago |
|
zth
|
5ef9320879
|
行政区划
|
4 months ago |
|
zth
|
ba9aec8815
|
行政区划
|
4 months ago |
ljf
|
fc0bb459ec
|
同步
|
4 months ago |
|
hxh
|
67a4f66a62
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
# shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
|
4 months ago |
|
ljf
|
0eef93d798
|
同步
|
4 months ago |
|
ljf
|
9e14b10037
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java
|
4 months ago |
|
黄星淮
|
d087b94c71
|
Merge branch 'release-sy-v1.0.0' into 'master'
Release sy v1.0.0
See merge request project/water/shuili!364
|
7 months ago |
|
hxh
|
0501a585e9
|
feat: 修改登出接口
|
7 months ago |
|
hxh
|
1cf0c83e23
|
feat: 调整登录逻辑
|
7 months ago |
|
hxh
|
6acf7c78d4
|
Merge remote-tracking branch 'refs/remotes/origin/feature-v1.3.0' into release-sy-v1.0.0
|
9 months ago |
|
hxh
|
e180f6fb7b
|
Merge branch 'refs/heads/feature-v1.5.0' into release-sy-v1.0.0
|
9 months ago |
|
hxh
|
0ea00c1bea
|
Merge branch 'refs/heads/feature-v1.4.0' into release-sy-v1.0.0
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
# shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java
# shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
# shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordSearchDto.java
# shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java
|
9 months ago |
|
hxh
|
d92460ff1a
|
fix: 修复sql
|
9 months ago |
|
hxh
|
8709e316d6
|
feat: 添加添加堤防级别查询参数
|
9 months ago |
|
hxh
|
d80bf0a0b6
|
feat: 添加工程规模查询条件
|
9 months ago |
|
hxh
|
2c17f5d506
|
fix: 修复sql
|
9 months ago |
|
hxh
|
5e018bc1aa
|
fix: 修复sql
|
9 months ago |
|
hxh
|
e07a72308c
|
fix: 修复sql
|
9 months ago |
|
hxh
|
a6240781e9
|
fix: 补充字段
|
9 months ago |
|
hxh
|
b09beec6e8
|
fix: 补充字段
|
9 months ago |
|
hxh
|
97b3668589
|
fix: 补充字段
|
9 months ago |
|
hxh
|
bbd65897a6
|
fix: 修改提交审批逻辑
|
9 months ago |
|
hxh
|
fe9ab0c0a1
|
fix: 修改提交审批逻辑
|
9 months ago |
|
hxh
|
1142db375b
|
feat: 补充水闸巡检权限按钮
|
9 months ago |
|
hxh
|
87bdb38130
|
fix: 允许驳回的重新提交
|
9 months ago |
|
hxh
|
73e501f092
|
fix: 菜单sql调整
|
9 months ago |
|
hxh
|
b8dcfe9bb1
|
fix: 修复报名错误
|
9 months ago |
|
hxh
|
8a480b33db
|
fix: 修复报名错误
|
9 months ago |
|
hxh
|
3f143dcf28
|
fix: 水闸巡检记录adcd查询修复
|
9 months ago |
|
hxh
|
9969c2ed75
|
Merge branch 'refs/heads/feature-v1.4.0' into feature-v1.5.0
|
9 months ago |
|
hxh
|
732909bf83
|
fix: 添加行政区划检索逻辑
|
9 months ago |
|
hxh
|
5e37692992
|
fix: 调整行政区划逻辑
|
9 months ago |
|
hxh
|
cc8642465d
|
fix: 修复上传路径
|
9 months ago |
|
hxh
|
dc96cbb4ea
|
feat: 调整区划条件逻辑
|
9 months ago |
|
hxh
|
6e77d38efd
|
feat: sql脚本维护
|
9 months ago |
|
hxh
|
9364f10637
|
feat: 检索对象基于用户所在行政区划
|
9 months ago |
|
hxh
|
fe40b9e172
|
feat: 修改字段名
|
9 months ago |
|
hxh
|
555e5b5fe3
|
feat: 添加用户所在行政规划
|
9 months ago |
|
hxh
|
1e0d8782d4
|
fix: 修复水闸巡检记录列表
|
9 months ago |
|
hxh
|
d7707d31c0
|
Merge branch 'refs/heads/feature-v1.4.0' into feature-v1.5.0
|
9 months ago |
|
hxh
|
d9bd1e36ec
|
fix: 修复sql
|
9 months ago |
|
hxh
|
d9409a280b
|
fix: 补充堤防、水闸类型
|
9 months ago |
|
hxh
|
c6122be06a
|
fix: 修复sql
|
9 months ago |
|
hxh
|
0abad8b29e
|
fix: 修复sql
|
9 months ago |
