 hnu202326010122
|
ef92a10614
|
Merge pull request '注册接口' (#42) from jingyou_branch into develop
|
1 month ago |
|
周竞由
|
85fe0bd79b
|
注册接口
|
1 month ago |
 hnu202326010106
|
1628e7a8ec
|
Merge pull request '王磊——第十周周总结和第十一周周计划' (#41) from wanglei_branch into develop
|
1 month ago |
|
wanglei
|
4165b0044c
|
王磊——第十周周总结和第十一周周计划
|
1 month ago |
 ZHW
|
f2830d939a
|
第十一周会议纪要、张红卫第十周总结和第十一周计划
|
1 month ago |
|
ZHW
|
b6ca4eee31
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
1 month ago |
 luoyuehang
|
4a238a5cf8
|
罗月航第十周周总结及第十一周周计划
|
1 month ago |
|
ZHW
|
03fc9d219b
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
1 month ago |
|
周竞由
|
5123d1f0c5
|
周竞由第十周周总结和第十一周周计划
|
1 month ago |
 tianyuan
|
4d2e5f66c8
|
11周计划及10周总结
|
1 month ago |
|
hnu202326010125
|
8e176552a1
|
Merge pull request 'app1登录修改' (#40) from luoyuehang_branch into develop
|
1 month ago |
|
luoyuehang
|
6cdaa073e8
|
罗月航app1的登录页面
|
1 month ago |
|
hnu202326010125
|
5a05754daf
|
Merge pull request '登录app1修改' (#39) from luoyuehang_branch into develop
|
1 month ago |
|
luoyuehang
|
87cbc2122a
|
罗月航app1的登录页面
|
1 month ago |
|
luoyuehang
|
f27797e1a5
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
1 month ago |
|
luoyuehang
|
0958327fbb
|
罗月航app1的登录页面
|
1 month ago |
|
ZHW
|
413bd0dad1
|
登录
|
1 month ago |
|
hnu202326010122
|
20be744f93
|
Merge pull request '告警逻辑1.0' (#38) from jingyou_branch into develop
|
1 month ago |
|
周竞由
|
c73d493efe
|
告警逻辑1.0
|
1 month ago |
|
hnu202326010125
|
b494c575e7
|
Merge pull request 'app1的登录功能' (#37) from luoyuehang_branch into develop
|
1 month ago |
|
ZHW
|
90a3f5aa81
|
登录
|
1 month ago |
|
luoyuehang
|
fd9727b579
|
罗月航app1的登录页面
|
1 month ago |
|
p95fco63j
|
08e72ad2a7
|
Merge pull request '修正依赖版本' (#36) from junmao_branch into develop
|
1 month ago |
|
tianyuan
|
5ca86891aa
|
修正依赖版本
|
1 month ago |
|
p95fco63j
|
3e8c5beb2f
|
Merge pull request '服务器地址' (#35) from junmao_branch into develop
|
1 month ago |
|
tianyuan
|
2542596efe
|
mqtt服务器地址
|
1 month ago |
|
p95fco63j
|
555b45f525
|
Merge pull request '目录修正' (#34) from junmao_branch into develop
|
1 month ago |
|
tianyuan
|
8aa64e4158
|
目录修正
|
1 month ago |
|
hnu202326010122
|
99914981a2
|
Merge pull request '修复mapper和repository文件夹冲突' (#33) from jingyou_branch into develop
|
1 month ago |
|
周竞由
|
7e81089d15
|
登录接口1.2
|
1 month ago |
|
p95fco63j
|
cb2335b435
|
Merge pull request '修改mqtt变量' (#32) from junmao_branch into develop
|
1 month ago |
|
tianyuan
|
3ac29039b9
|
修改mqtt变量
|
1 month ago |
|
hnu202326010122
|
344121d19a
|
登录接口1.1
|
1 month ago |
|
周竞由
|
ca86a994b1
|
登录接口1.1
|
1 month 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
|
1 month ago |
|
hnu202326010106
|
951f8306a8
|
Merge pull request '代码注释' (#30) from wanglei_branch into develop
|
1 month ago |
|
wanglei
|
0413e41240
|
王磊——代码注释
|
1 month ago |
|
p95fco63j
|
71410741b7
|
Merge pull request '删除过时文件' (#29) from junmao_branch into develop
|
1 month ago |
|
tianyuan
|
e8f6f5de02
|
删除过时文件
|
1 month ago |
|
p95fco63j
|
14e68de32f
|
Merge pull request 'Integration依赖添加' (#28) from junmao_branch into develop
|
1 month ago |
|
tianyuan
|
b4e0b2471e
|
依赖添加
|
1 month ago |
|
周竞由
|
c3f7b955a8
|
登录接口
|
1 month ago |
|
hnu202326010106
|
7e32ceeb54
|
Merge pull request 'pom.xml' (#27) from wanglei_branch into develop
|
1 month ago |
|
wanglei
|
1895b8e13a
|
王磊——pom.xml
|
1 month ago |
|
hnu202326010106
|
2cc26526c3
|
Merge pull request '王磊——第十周新增开发工单管理接口，开发扫码用水接口，水质信息查询接口' (#26) from wanglei_branch into develop
|
1 month ago |
|
wanglei
|
b62c4fd36d
|
王磊——第十周新增开发工单管理接口，开发扫码用水接口，水质信息查询接口
|
1 month ago |
|
tianyuan
|
c23068e1ca
|
修改周总结位置
|
2 months ago |
|
tianyuan
|
b75acd70ea
|
修改周总结位置
|
2 months ago |
|
周竞由
|
ed15f502d2
|
周竞由的第9周周总结和第10周周计划
|
2 months ago |
|
ZHW
|
f09dc3a85c
|
张红卫第十周会议纪要、周计划与第九周总结
|
2 months ago |
