 ZHW
|
8e351191c3
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
 wanglei
|
df2729026d
|
新增查询功能
|
2 months ago |
|
ZHW
|
db44ffd0e8
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
ZHW
|
6c530a5c63
|
片区选择负责人优化
|
2 months ago |
|
ZHW
|
230a58494f
|
去掉管理员的状态
|
2 months ago |
|
ZHW
|
76cd37aa1a
|
去掉管理员的状态
|
2 months ago |
|
ZHW
|
8e616c55f8
|
去掉管理员的状态
|
2 months ago |
|
ZHW
|
91d93397e9
|
终端机关联供水机
|
2 months ago |
|
ZHW
|
3aefd99d64
|
设备筛选
|
2 months ago |
 luoyuehang
|
964289356d
|
app1\2 样式修改
|
2 months ago |
|
luoyuehang
|
c32a325481
|
app2手机端的扫码
|
2 months ago |
|
ZHW
|
8738ae04a9
|
设备筛选
|
2 months ago |
|
ZHW
|
17dc8d4140
|
设备筛选
|
2 months ago |
|
ZHW
|
7d48e38cea
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
wanglei
|
2a9a672707
|
修改地区功能
|
2 months ago |
|
ZHW
|
0581649705
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 months ago |
|
hnu202326010125
|
965f0a375b
|
Merge pull request 'app1\2的手机端适应修改' (#168) from luoyuehang_branch into develop
|
2 months ago |
|
luoyuehang
|
4db4c16606
|
app1和app2为适应手机端的修改
|
2 months ago |
|
wanglei
|
c3059709b3
|
修改地区id为地区name功能
|
2 months ago |
|
ZHW
|
b3d2fe0652
|
设备筛选
|
2 months ago |
|
ZHW
|
9778a086c0
|
设备的添加
|
2 months ago |
 tianyuan
|
f1cfc94753
|
cors放行app
|
2 months ago |
|
tianyuan
|
5b8680f69e
|
修改为https连接
|
2 months ago |
|
tianyuan
|
d6521c3468
|
修改为https连接
|
2 months ago |
|
tianyuan
|
d9baffbb70
|
Merge remote-tracking branch 'origin/junmao_branch' into junmao_branch
# Conflicts:
# src/main/java/com/campus/water/controller/GlobalExceptionHandler.java
|
2 months ago |
|
tianyuan
|
77dfbba053
|
修改为https连接
|
2 months ago |
|
luoyuehang
|
feec9efb08
|
项目配置修改
|
2 months ago |
|
tianyuan
|
4e1161b009
|
软件包路径修改
|
2 months ago |
 周竞由
|
8e1ce478a5
|
全局异常处理完善
|
2 months ago |
|
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 |
|
wanglei
|
5c63baeeb8
|
去除设备统计功能
|
2 months ago |
|
ZHW
|
caaf265c92
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
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 |
|
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 |
