校区添加 #150

Merged

pc8xi2fbj merged 9 commits from zhanghongwei_branch into develop

pc8xi2fbj commented

Collaborator

There is no content yet.

pc8xi2fbj added 1 commit

c630470aa1 片区部分优化

pc8xi2fbj added 25 commits

36462f6927 增加区域设备统计功能

1f80591d5a Merge pull request '增加区域设备统计功能' (#148 ) from wanglei_branch into develop

97264670fe 优化添加区域管理员功能

e25b6c9c8c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

# Conflicts:
#	src/main/java/com/campus/water/service/AreaService.java

21c0738816 Merge pull request '优化添加区域管理员功能' (#149 ) from wanglei_branch into develop

1d3c70776f Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

86dfe0da93 优化功能

60a44f421f Merge pull request '优化功能' (#151 ) from wanglei_branch into develop

a84f365c1a Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

# Conflicts:
#	src/main/java/com/campus/water/service/AreaService.java

e2e8eb99ea 优化功能

17968e1458 Merge remote-tracking branch 'origin/develop' into wanglei_branch

4ed6f75f54 Merge pull request '更改' (#152 ) from wanglei_branch into develop

30a85dde9c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

e6f086843c Merge remote-tracking branch 'origin/develop' into wanglei_branch

41fda45644 增加查询无负责人的区域功能

94b93593d9 Merge pull request '增加查询无负责人的区域功能' (#153 ) from wanglei_branch into develop

8697dc552c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

6b17bc1721 修改告警地区id关联以及数据发送定时

0e0e9671ba 解决格式警告

a409324058 Merge pull request '修改告警地区id关联以及数据发送定时' (#154 ) from junmao_branch into develop

7412949355 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

7dbe437c59 修改管理员区域功能

2831880f06 Merge pull request '修改管理员区域功能' (#155 ) from wanglei_branch into develop

caaf265c92 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

673b22b310 片区部分优化

pc8xi2fbj merged commit 7928fb6edb into develop 2 weeks ago

pc8xi2fbj referenced this issue from a commit

Merge pull request '校区添加' (#150) from zhanghongwei_branch into develop

The pull request has been merged as 7928fb6edb.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p95fco63j/Water_Machine_Management_System#150