 wanglei
|
82daeb53b3
|
修改问题
|
3 months ago |
|
wanglei
|
64347a81e3
|
修改映射冲突问题
|
3 months ago |
 p95fco63j
|
507c005d3e
|
Merge pull request '数据库配置修改' (#47) from junmao_branch into develop
|
3 months ago |
|
tianyuan
|
51ca748038
|
数据库连接配置修改2
|
3 months ago |
|
p95fco63j
|
7083a21a0b
|
Merge pull request '数据库连接配置' (#46) from junmao_branch into develop
|
3 months ago |
|
tianyuan
|
d66ad471bf
|
数据库连接配置修改
|
3 months ago |
|
hnu202326010106
|
10b6ad77b5
|
Merge pull request '接口代码修改' (#45) from wanglei_branch into develop
|
3 months ago |
|
wanglei
|
81321df1d7
|
修改接口代码
|
3 months ago |
|
tianyuan
|
7430e23bfe
|
活动图-顺序图-类图
|
3 months ago |
|
hnu202326010106
|
6e1f9969f7
|
Merge pull request '王磊——开发数据统计接口（按设备 / 地区 / 时间统计用水量、告警次数）、设备状态管理接口（在线 / 离线标记）' (#44) from wanglei_branch into develop
|
3 months ago |
|
wanglei
|
bdd108c83c
|
Merge remote-tracking branch 'origin/wanglei_branch' into wanglei_branch
|
3 months ago |
|
wanglei
|
4461d18845
|
王磊——开发数据统计接口（按设备 / 地区 / 时间统计用水量、告警次数）、设备状态管理接口（在线 / 离线标记）
|
3 months ago |
|
wanglei
|
cc503b5ee7
|
王磊——开发数据统计接口（按设备 / 地区 / 时间统计用水量、告警次数）、设备状态管理接口（在线 / 离线标记）
|
3 months ago |
 hnu202326010122
|
9beee3cf72
|
Merge pull request '权限细化，告警功能完善' (#43) from jingyou_branch into develop
|
3 months ago |
|
周竞由
|
8d19836ea0
|
权限细化：实现接口级权限控制（学生仅访问个人用水 / 水质查询，维修人员仅访问辖区工单 / 设备，管理员全权限）；
告警功能完善：告警分级（一般 / 紧急）、告警推送（Web/APP 消息提醒）、告警历史查询接口；
|
3 months ago |
|
hnu202326010122
|
ef92a10614
|
Merge pull request '注册接口' (#42) from jingyou_branch into develop
|
3 months ago |
|
周竞由
|
85fe0bd79b
|
注册接口
|
3 months ago |
|
hnu202326010106
|
1628e7a8ec
|
Merge pull request '王磊——第十周周总结和第十一周周计划' (#41) from wanglei_branch into develop
|
3 months ago |
|
wanglei
|
4165b0044c
|
王磊——第十周周总结和第十一周周计划
|
3 months ago |
 ZHW
|
f2830d939a
|
第十一周会议纪要、张红卫第十周总结和第十一周计划
|
3 months ago |
|
ZHW
|
b6ca4eee31
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
3 months ago |
 luoyuehang
|
4a238a5cf8
|
罗月航第十周周总结及第十一周周计划
|
3 months ago |
|
ZHW
|
03fc9d219b
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
3 months ago |
|
周竞由
|
5123d1f0c5
|
周竞由第十周周总结和第十一周周计划
|
3 months ago |
|
tianyuan
|
4d2e5f66c8
|
11周计划及10周总结
|
3 months ago |
|
hnu202326010125
|
8e176552a1
|
Merge pull request 'app1登录修改' (#40) from luoyuehang_branch into develop
|
3 months ago |
|
luoyuehang
|
6cdaa073e8
|
罗月航app1的登录页面
|
3 months ago |
|
hnu202326010125
|
5a05754daf
|
Merge pull request '登录app1修改' (#39) from luoyuehang_branch into develop
|
3 months ago |
|
luoyuehang
|
87cbc2122a
|
罗月航app1的登录页面
|
3 months ago |
|
luoyuehang
|
f27797e1a5
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
3 months ago |
|
luoyuehang
|
0958327fbb
|
罗月航app1的登录页面
|
3 months ago |
|
ZHW
|
413bd0dad1
|
登录
|
3 months ago |
|
hnu202326010122
|
20be744f93
|
Merge pull request '告警逻辑1.0' (#38) from jingyou_branch into develop
|
3 months ago |
|
周竞由
|
c73d493efe
|
告警逻辑1.0
|
3 months ago |
|
hnu202326010125
|
b494c575e7
|
Merge pull request 'app1的登录功能' (#37) from luoyuehang_branch into develop
|
3 months ago |
|
ZHW
|
90a3f5aa81
|
登录
|
3 months ago |
|
luoyuehang
|
fd9727b579
|
罗月航app1的登录页面
|
3 months ago |
|
p95fco63j
|
08e72ad2a7
|
Merge pull request '修正依赖版本' (#36) from junmao_branch into develop
|
3 months ago |
|
tianyuan
|
5ca86891aa
|
修正依赖版本
|
3 months ago |
|
p95fco63j
|
3e8c5beb2f
|
Merge pull request '服务器地址' (#35) from junmao_branch into develop
|
3 months ago |
|
tianyuan
|
2542596efe
|
mqtt服务器地址
|
3 months ago |
|
p95fco63j
|
555b45f525
|
Merge pull request '目录修正' (#34) from junmao_branch into develop
|
3 months ago |
|
tianyuan
|
8aa64e4158
|
目录修正
|
3 months ago |
|
hnu202326010122
|
99914981a2
|
Merge pull request '修复mapper和repository文件夹冲突' (#33) from jingyou_branch into develop
|
3 months ago |
|
周竞由
|
7e81089d15
|
登录接口1.2
|
3 months ago |
|
p95fco63j
|
cb2335b435
|
Merge pull request '修改mqtt变量' (#32) from junmao_branch into develop
|
3 months ago |
|
tianyuan
|
3ac29039b9
|
修改mqtt变量
|
3 months ago |
|
hnu202326010122
|
344121d19a
|
登录接口1.1
|
3 months ago |
|
周竞由
|
ca86a994b1
|
登录接口1.1
|
3 months ago |
|
周竞由
|
47a0c184e7
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/com/campus/water/mapper/AdminRepository.java
# src/main/java/com/campus/water/mapper/RepairerAuthRepository.java
# src/main/java/com/campus/water/mapper/UserRepository.java
|
3 months ago |
