 ZHW
|
8697dc552c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
 wanglei
|
41fda45644
|
增加查询无负责人的区域功能
|
2 months ago |
|
ZHW
|
30a85dde9c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_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 |
|
wanglei
|
86dfe0da93
|
优化功能
|
2 months ago |
|
ZHW
|
1d3c70776f
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
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 |
|
wanglei
|
36462f6927
|
增加区域设备统计功能
|
2 months ago |
|
wanglei
|
6cf13115e8
|
增加区域和区域管理员关联
|
2 months ago |
|
wanglei
|
379f6ed295
|
修改area_id长度
|
2 months ago |
|
wanglei
|
bbf5db01bc
|
修改area_id长度
|
2 months ago |
|
ZHW
|
df853489a5
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
ZHW
|
74605b6de6
|
告警表格化
|
2 months ago |
|
ZHW
|
4aaad471e6
|
告警表格化
|
2 months ago |
 luoyuehang
|
32d0cc59cc
|
app1界面样式修改
|
2 months ago |
|
wanglei
|
268f33036c
|
优化修改设备信息相关的代码
|
2 months ago |
|
wanglei
|
955b1d0445
|
修改维修人员工单相关的代码
|
2 months ago |
|
pc8xi2fbj
|
38c49ca3e7
|
Merge pull request '图表和片区' (#139) from zhanghongwei_branch into develop
|
2 months ago |
|
ZHW
|
8638bfcacf
|
图表添加
|
2 months ago |
|
wanglei
|
a20c1b6725
|
新增管理员修改设备信息的代码
|
2 months ago |
|
wanglei
|
01638fe6f2
|
修改parent_area_id长度代码
|
2 months ago |
|
wanglei
|
59c48fe855
|
修改parent_maker_id长度代码
|
2 months ago |
|
ZHW
|
14b779ee5e
|
设备的片区关联
|
2 months ago |
|
ZHW
|
d1bbf7ce31
|
校区的添加
|
2 months ago |
|
wanglei
|
f52daac91b
|
修改devicecontroller代码
|
2 months ago |
|
wanglei
|
ea6b15908f
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 months ago |
|
luoyuehang
|
78d2d25a5d
|
app1\2界面样式修改
|
2 months ago |
|
wanglei
|
4c2d11e44c
|
新增根据片区增加终端机代码
|
2 months ago |
|
luoyuehang
|
51ff362540
|
app1界面样式修改
|
2 months ago |
 p95fco63j
|
c419a996ad
|
Merge pull request '工具类修改' (#131) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
dbdc9d204c
|
工具类修改
|
2 months ago |
|
luoyuehang
|
68f486c85d
|
app1的信息查看功能补充
|
2 months ago |
|
luoyuehang
|
4dd70b9a43
|
app1的信息查看功能补充
|
2 months ago |
|
ZHW
|
75e2b9a394
|
优化
|
2 months ago |
|
hnu202326010106
|
c2af3b4955
|
Merge pull request '删除解除设备关联代码' (#128) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
9fc06f1d05
|
删除解除设备关联代码
|
2 months ago |
|
pc8xi2fbj
|
30484bbecf
|
Merge pull request '部分优化' (#127) from zhanghongwei_branch into develop
|
2 months ago |
|
wanglei
|
2f25bb31ea
|
新增解除设备关联代码
|
2 months ago |
|
ZHW
|
6fd4ff8471
|
删除设备主要是关联设备的删除
|
2 months ago |
|
wanglei
|
2e512362e7
|
新增密码修改代码
|
2 months ago |
|
p95fco63j
|
cbdedef19b
|
Merge pull request '模拟发送任务修改' (#124) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
429a1df076
|
模拟发送任务修改
|
2 months ago |
|
ZHW
|
a217f0ac6c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
wanglei
|
686e175b68
|
新增终端管理代码
|
2 months ago |
|
wanglei
|
e92d7a63ce
|
新增终端管理代码
|
2 months ago |
|
ZHW
|
92021ee392
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
luoyuehang
|
40950edd4a
|
app2的地图查看功能
|
2 months ago |
