 wanglei
|
c3059709b3
|
修改地区id为地区name功能
|
2 weeks ago |
 ZHW
|
9778a086c0
|
设备的添加
|
2 weeks ago |
 tianyuan
|
f1cfc94753
|
cors放行app
|
2 weeks ago |
|
tianyuan
|
5b8680f69e
|
修改为https连接
|
2 weeks ago |
|
tianyuan
|
d6521c3468
|
修改为https连接
|
2 weeks ago |
|
tianyuan
|
d9baffbb70
|
Merge remote-tracking branch 'origin/junmao_branch' into junmao_branch
# Conflicts:
# src/main/java/com/campus/water/controller/GlobalExceptionHandler.java
|
2 weeks ago |
|
tianyuan
|
77dfbba053
|
修改为https连接
|
2 weeks ago |
 luoyuehang
|
feec9efb08
|
项目配置修改
|
2 weeks ago |
|
tianyuan
|
4e1161b009
|
软件包路径修改
|
2 weeks ago |
 周竞由
|
8e1ce478a5
|
全局异常处理完善
|
2 weeks ago |
|
tianyuan
|
af3f2ba219
|
工具类修改
|
2 weeks ago |
|
pc8xi2fbj
|
7928fb6edb
|
Merge pull request '校区添加' (#150) from zhanghongwei_branch into develop
|
2 weeks ago |
|
ZHW
|
673b22b310
|
片区部分优化
|
2 weeks ago |
|
p95fco63j
|
e2d67429ac
|
Merge pull request '创建工单时添加alert_id' (#157) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
0a7428bd16
|
创建工单时添加alert_id
|
2 weeks ago |
|
wanglei
|
5c63baeeb8
|
去除设备统计功能
|
2 weeks ago |
|
ZHW
|
caaf265c92
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
wanglei
|
7dbe437c59
|
修改管理员区域功能
|
2 weeks ago |
|
ZHW
|
7412949355
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
p95fco63j
|
a409324058
|
Merge pull request '修改告警地区id关联以及数据发送定时' (#154) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
0e0e9671ba
|
解决格式警告
|
2 weeks ago |
|
tianyuan
|
6b17bc1721
|
修改告警地区id关联以及数据发送定时
|
2 weeks ago |
|
ZHW
|
8697dc552c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
wanglei
|
41fda45644
|
增加查询无负责人的区域功能
|
2 weeks ago |
|
ZHW
|
30a85dde9c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
wanglei
|
e2e8eb99ea
|
优化功能
|
2 weeks ago |
|
ZHW
|
a84f365c1a
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# src/main/java/com/campus/water/service/AreaService.java
|
2 weeks ago |
|
wanglei
|
86dfe0da93
|
优化功能
|
2 weeks ago |
|
ZHW
|
1d3c70776f
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
ZHW
|
e25b6c9c8c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# src/main/java/com/campus/water/service/AreaService.java
|
2 weeks ago |
|
wanglei
|
97264670fe
|
优化添加区域管理员功能
|
2 weeks ago |
|
ZHW
|
c630470aa1
|
片区部分优化
|
2 weeks ago |
|
wanglei
|
36462f6927
|
增加区域设备统计功能
|
2 weeks ago |
|
wanglei
|
6cf13115e8
|
增加区域和区域管理员关联
|
2 weeks ago |
|
wanglei
|
379f6ed295
|
修改area_id长度
|
2 weeks ago |
|
wanglei
|
bbf5db01bc
|
修改area_id长度
|
2 weeks ago |
|
ZHW
|
df853489a5
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
ZHW
|
74605b6de6
|
告警表格化
|
2 weeks ago |
|
ZHW
|
4aaad471e6
|
告警表格化
|
2 weeks ago |
|
luoyuehang
|
32d0cc59cc
|
app1界面样式修改
|
2 weeks ago |
|
wanglei
|
268f33036c
|
优化修改设备信息相关的代码
|
2 weeks ago |
|
wanglei
|
955b1d0445
|
修改维修人员工单相关的代码
|
2 weeks ago |
|
pc8xi2fbj
|
38c49ca3e7
|
Merge pull request '图表和片区' (#139) from zhanghongwei_branch into develop
|
2 weeks ago |
|
ZHW
|
8638bfcacf
|
图表添加
|
2 weeks ago |
|
wanglei
|
a20c1b6725
|
新增管理员修改设备信息的代码
|
2 weeks ago |
|
wanglei
|
01638fe6f2
|
修改parent_area_id长度代码
|
2 weeks ago |
|
wanglei
|
59c48fe855
|
修改parent_maker_id长度代码
|
2 weeks ago |
|
ZHW
|
14b779ee5e
|
设备的片区关联
|
2 weeks ago |
|
ZHW
|
d1bbf7ce31
|
校区的添加
|
2 weeks ago |
|
wanglei
|
f52daac91b
|
修改devicecontroller代码
|
2 weeks ago |
