 tianyuan
|
f1cfc94753
|
cors放行app
|
1 week ago |
|
tianyuan
|
5b8680f69e
|
修改为https连接
|
1 week ago |
|
tianyuan
|
d6521c3468
|
修改为https连接
|
1 week ago |
|
tianyuan
|
d9baffbb70
|
Merge remote-tracking branch 'origin/junmao_branch' into junmao_branch
# Conflicts:
# src/main/java/com/campus/water/controller/GlobalExceptionHandler.java
|
1 week ago |
|
tianyuan
|
77dfbba053
|
修改为https连接
|
1 week ago |
|
tianyuan
|
9e9b452b1b
|
Merge remote-tracking branch 'origin/develop' into junmao_branch
|
2 weeks ago |
 luoyuehang
|
feec9efb08
|
项目配置修改
|
2 weeks ago |
|
tianyuan
|
840bca68e8
|
修正配置文件
|
2 weeks ago |
|
tianyuan
|
4e1161b009
|
软件包路径修改
|
2 weeks ago |
 hnu202326010106
|
78432de553
|
Merge pull request '数据库设计文档' (#160) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
a855ba3995
|
数据库设计文档
|
2 weeks ago |
 hnu202326010122
|
af8120601b
|
Merge pull request '全局异常处理完善' (#159) from jingyou_branch into develop
|
2 weeks ago |
|
周竞由
|
8e1ce478a5
|
全局异常处理完善
|
2 weeks ago |
|
p95fco63j
|
c138bc6baf
|
Merge pull request '工具类修改' (#158) from junmao_branch into develop
|
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 |
|
hnu202326010106
|
e1ac587346
|
Merge pull request '去除设备统计功能' (#156) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
5c63baeeb8
|
去除设备统计功能
|
2 weeks ago |
|
ZHW
|
caaf265c92
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
hnu202326010106
|
2831880f06
|
Merge pull request '修改管理员区域功能' (#155) from wanglei_branch into develop
|
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 |
|
hnu202326010106
|
94b93593d9
|
Merge pull request '增加查询无负责人的区域功能' (#153) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
41fda45644
|
增加查询无负责人的区域功能
|
2 weeks ago |
|
wanglei
|
e6f086843c
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 weeks ago |
|
ZHW
|
30a85dde9c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
hnu202326010106
|
4ed6f75f54
|
Merge pull request '更改' (#152) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
17968e1458
|
Merge remote-tracking branch 'origin/develop' into wanglei_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 |
|
hnu202326010106
|
60a44f421f
|
Merge pull request '优化功能' (#151) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
86dfe0da93
|
优化功能
|
2 weeks ago |
|
ZHW
|
1d3c70776f
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
hnu202326010106
|
21c0738816
|
Merge pull request '优化添加区域管理员功能' (#149) from wanglei_branch into develop
|
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 |
|
hnu202326010106
|
1f80591d5a
|
Merge pull request '增加区域设备统计功能' (#148) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
36462f6927
|
增加区域设备统计功能
|
2 weeks ago |
|
hnu202326010106
|
ce066db1ce
|
Merge pull request '增加区域和区域管理员关联' (#147) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
6cf13115e8
|
增加区域和区域管理员关联
|
2 weeks ago |
|
hnu202326010106
|
31ba877c7b
|
Merge pull request '修改area_id长度' (#146) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
379f6ed295
|
修改area_id长度
|
2 weeks ago |
