 tianyuan
|
af3f2ba219
|
工具类修改
|
2 months ago |
 pc8xi2fbj
|
7928fb6edb
|
Merge pull request '校区添加' (#150) from zhanghongwei_branch into develop
|
2 months ago |
|
ZHW
|
673b22b310
|
片区部分优化
|
2 months ago |
|
p95fco63j
|
e2d67429ac
|
Merge pull request '创建工单时添加alert_id' (#157) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
0a7428bd16
|
创建工单时添加alert_id
|
2 months ago |
 hnu202326010106
|
e1ac587346
|
Merge pull request '去除设备统计功能' (#156) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
5c63baeeb8
|
去除设备统计功能
|
2 months ago |
|
ZHW
|
caaf265c92
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
hnu202326010106
|
2831880f06
|
Merge pull request '修改管理员区域功能' (#155) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
7dbe437c59
|
修改管理员区域功能
|
2 months ago |
|
ZHW
|
7412949355
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
p95fco63j
|
a409324058
|
Merge pull request '修改告警地区id关联以及数据发送定时' (#154) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
0e0e9671ba
|
解决格式警告
|
2 months ago |
|
tianyuan
|
6b17bc1721
|
修改告警地区id关联以及数据发送定时
|
2 months ago |
|
ZHW
|
8697dc552c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
hnu202326010106
|
94b93593d9
|
Merge pull request '增加查询无负责人的区域功能' (#153) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
41fda45644
|
增加查询无负责人的区域功能
|
2 months ago |
|
wanglei
|
e6f086843c
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 months ago |
|
ZHW
|
30a85dde9c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
hnu202326010106
|
4ed6f75f54
|
Merge pull request '更改' (#152) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
17968e1458
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 months ago |
|
wanglei
|
e2e8eb99ea
|
优化功能
|
2 months ago |
|
ZHW
|
a84f365c1a
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# src/main/java/com/campus/water/service/AreaService.java
|
2 months ago |
|
hnu202326010106
|
60a44f421f
|
Merge pull request '优化功能' (#151) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
86dfe0da93
|
优化功能
|
2 months ago |
|
ZHW
|
1d3c70776f
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
hnu202326010106
|
21c0738816
|
Merge pull request '优化添加区域管理员功能' (#149) from wanglei_branch into develop
|
2 months ago |
|
ZHW
|
e25b6c9c8c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# src/main/java/com/campus/water/service/AreaService.java
|
2 months ago |
|
wanglei
|
97264670fe
|
优化添加区域管理员功能
|
2 months ago |
|
ZHW
|
c630470aa1
|
片区部分优化
|
2 months ago |
|
hnu202326010106
|
1f80591d5a
|
Merge pull request '增加区域设备统计功能' (#148) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
36462f6927
|
增加区域设备统计功能
|
2 months ago |
|
hnu202326010106
|
ce066db1ce
|
Merge pull request '增加区域和区域管理员关联' (#147) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
6cf13115e8
|
增加区域和区域管理员关联
|
2 months ago |
|
hnu202326010106
|
31ba877c7b
|
Merge pull request '修改area_id长度' (#146) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
379f6ed295
|
修改area_id长度
|
2 months ago |
|
hnu202326010106
|
02f1abea2f
|
Merge pull request '修改area_id长度' (#145) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
bbf5db01bc
|
修改area_id长度
|
2 months ago |
|
hnu202326010106
|
4ad79d7ba4
|
Merge pull request '王磊-第十四周周总结和第十五周周计划' (#144) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
22e5989be8
|
王磊-第十四周周总结和第十五周周计划
|
2 months ago |
|
wanglei
|
7e33faefb1
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 months ago |
|
ZHW
|
e3103473ba
|
第十五周会议纪要、张红卫第十四周个人周总结和十五周个人周计划
|
2 months ago |
|
ZHW
|
df853489a5
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
ZHW
|
74605b6de6
|
告警表格化
|
2 months ago |
 luoyuehang
|
a0f571331b
|
罗月航第十四周周总结及第十五周周计划
|
2 months ago |
 周竞由
|
96d5e2a826
|
周竞由的13周周总结和14周周计划
|
2 months ago |
|
周竞由
|
c6e4c7dd23
|
周竞由的13周周总结和14周周计划
|
2 months ago |
|
p95fco63j
|
2d9e38e6f5
|
Merge pull request '15周周计划，14周总结' (#143) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
a2e854cf51
|
15周计划，14周总结
|
2 months ago |
|
ZHW
|
4aaad471e6
|
告警表格化
|
2 months ago |
