 ZHW
|
68bb84036f
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
ZHW
|
32115669e2
|
去掉重派
|
2 weeks ago |
 hnu202326010106
|
c4d595c455
|
修改地区代码
|
2 weeks ago |
|
wanglei
|
e4aded018e
|
修改地区代码
|
2 weeks ago |
 luoyuehang
|
e5482eafd3
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
|
wanglei
|
dad6dce04f
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
# Conflicts:
# src/main/java/com/campus/water/controller/web/AreaController.java
|
2 weeks ago |
|
wanglei
|
aa72787505
|
修改地区代码
|
2 weeks ago |
|
pc8xi2fbj
|
60ff18a220
|
Merge pull request '待审核与人工派单' (#112) from zhanghongwei_branch into develop
|
2 weeks ago |
|
ZHW
|
1820e1c3cc
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
ZHW
|
870e43ba33
|
待审核与人工派单
|
2 weeks ago |
|
luoyuehang
|
4400a2a936
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
 p95fco63j
|
66cb45b556
|
Merge pull request '修改' (#111) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
4e8d050f83
|
修改设备地图查看功能接口
|
2 weeks ago |
|
luoyuehang
|
739e31a9b1
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
|
p95fco63j
|
2277ec7d19
|
Merge pull request '地图查看功能接口' (#110) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
24a27ed36d
|
设备地图查看功能接口
|
2 weeks ago |
|
luoyuehang
|
ba1db94c55
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
|
ZHW
|
66c23806b0
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# src/main/java/com/campus/water/service/WorkOrderServiceImpl.java
|
2 weeks ago |
|
hnu202326010106
|
916937b876
|
Merge pull request '修改人工派单代码' (#109) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
c5ac5a3645
|
修改人工派单代码
|
2 weeks ago |
|
wanglei
|
7def7464cc
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 weeks ago |
|
p95fco63j
|
f765bf89c4
|
Merge pull request '被派单通知接口' (#108) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
e18ae611fd
|
维修人员被派单通知接口实现
|
2 weeks ago |
|
hnu202326010125
|
d9db6143fe
|
Merge pull request 'app2查询实时数据功能' (#107) from luoyuehang_branch into develop
|
2 weeks ago |
|
luoyuehang
|
719c4c8692
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
|
luoyuehang
|
d8659df174
|
app2的学生查询实时数据功能
|
2 weeks ago |
|
hnu202326010125
|
779ae4214c
|
Merge pull request 'app2学生饮水量统计功能' (#106) from luoyuehang_branch into develop
|
2 weeks ago |
|
luoyuehang
|
407ccea15b
|
app2的学生饮水量统计功能
|
2 weeks ago |
|
ZHW
|
dbcb4755f9
|
片区
|
2 weeks ago |
|
p95fco63j
|
53c3bb5ada
|
Merge pull request '饮水量统计接口' (#105) from junmao_branch into develop
|
3 weeks ago |
|
hnu202326010106
|
34b499d17b
|
修改代码
|
3 weeks ago |
|
wanglei
|
e2232a1818
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
3 weeks ago |
|
wanglei
|
98032749b8
|
修改代码
|
3 weeks ago |
|
tianyuan
|
688d78ca2f
|
学生饮水量统计实现
|
3 weeks ago |
|
p95fco63j
|
477faa4740
|
Merge pull request '实时数据查询接口' (#103) from junmao_branch into develop
|
3 weeks ago |
|
tianyuan
|
2f11026c2b
|
实时数据查询接口实现
|
3 weeks ago |
|
hnu202326010106
|
3f1745885b
|
Merge pull request '修改增加地区功能代码' (#102) from wanglei_branch into develop
|
3 weeks ago |
|
wanglei
|
e8a07fa31d
|
修改增加地区功能代码
|
3 weeks ago |
|
hnu202326010106
|
b12f38f431
|
Merge pull request '完善工单状态转换功能代码' (#101) from wanglei_branch into develop
|
3 weeks ago |
|
wanglei
|
fef039a26b
|
完善工单状态转换功能代码
|
3 weeks ago |
|
ZHW
|
dd7ba6c712
|
第十四周会议纪要、第十三周总结与第十四周计划
|
3 weeks ago |
|
ZHW
|
df5cd4215f
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# doc/process/weekly/week-14/group/meeting-mintues-14.md
# doc/process/weekly/week-14/members/zhanghongwei-weekly-plan-14.md
# doc/process/weekly/week-14/members/zhanghongwei-weekly-summary-13.md
|
3 weeks ago |
|
ZHW
|
87eaaf8526
|
Merge remote-tracking branch 'origin/zhanghongwei_branch' into zhanghongwei_branch
# Conflicts:
# doc/process/weekly/week-14/group/meeting-mintues-14.md
# doc/process/weekly/week-14/members/zhanghongwei-weekly-plan-14.md
# doc/process/weekly/week-14/members/zhanghongwei-weekly-summary-13.md
|
3 weeks ago |
|
ZHW
|
e1bc8b3d62
|
第十四周会议纪要、第十三周总结与第十四周计划
|
3 weeks ago |
|
ZHW
|
07596bddba
|
第十四周会议纪要、第十三周总结与第十四周计划
|
3 weeks ago |
|
ZHW
|
347581aae0
|
第十四周会议纪要、第十三周总结与第十四周计划
|
3 weeks ago |
|
ZHW
|
fe5e742212
|
日期筛选
|
3 weeks ago |
|
ZHW
|
eaf39c2aca
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
3 weeks ago |
|
hnu202326010106
|
8bff03bde9
|
Merge pull request '王磊-第十三周周总结，第十四周周计划' (#100) from wanglei_branch into develop
|
3 weeks ago |
|
wanglei
|
b177a81979
|
王磊-第十三周周总结，第十四周周计划
|
3 weeks ago |
