 wanglei
|
9fc06f1d05
|
删除解除设备关联代码
|
2 months ago |
|
wanglei
|
2f25bb31ea
|
新增解除设备关联代码
|
2 months ago |
|
hnu202326010106
|
b5dc24783e
|
Merge pull request '新增密码修改代码' (#125) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
2e512362e7
|
新增密码修改代码
|
2 months ago |
 p95fco63j
|
cbdedef19b
|
Merge pull request '模拟发送任务修改' (#124) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
429a1df076
|
模拟发送任务修改
|
2 months ago |
|
hnu202326010106
|
0124ad1e31
|
Merge pull request '新增终端管理代码' (#123) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
686e175b68
|
新增终端管理代码
|
2 months ago |
|
hnu202326010106
|
c5f346827d
|
Merge pull request '新增终端管理代码' (#122) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
e92d7a63ce
|
新增终端管理代码
|
2 months ago |
 hnu202326010125
|
81b298fd59
|
Merge pull request 'app2的地图查看功能及app1的被派单通知功能' (#121) from luoyuehang_branch into develop
|
2 months ago |
|
luoyuehang
|
40950edd4a
|
app2的地图查看功能
|
2 months ago |
|
luoyuehang
|
4d2a7e66a0
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
p95fco63j
|
b48a0039ef
|
Merge pull request '终端位置表参数修改' (#120) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
b89a544f6d
|
修改终端位置表参数
|
2 months ago |
|
hnu202326010106
|
da2c309169
|
Merge pull request '新增获取个人信息代码' (#119) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
2dd02cb666
|
新增获取个人信息代码
|
2 months ago |
|
hnu202326010106
|
d38d636b86
|
Merge pull request '新增编辑管理员功能代码' (#117) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
0902dbc29a
|
新增编辑管理员功能代码
|
2 months ago |
|
luoyuehang
|
08ab1f457f
|
app2的被派单通知功能
|
2 months ago |
|
luoyuehang
|
3330b5c061
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
hnu202326010106
|
3a849aa13e
|
Merge pull request '修改地区代码' (#116) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
be73e1bf1a
|
修改地区代码
|
2 months ago |
|
luoyuehang
|
2ba2546194
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
hnu202326010106
|
462df55d0d
|
Merge pull request '修改地区代码' (#115) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
43df68a5c6
|
修改地区代码
|
2 months ago |
|
luoyuehang
|
81976603d8
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
hnu202326010106
|
05cd760b34
|
Merge pull request '修改地区代码' (#114) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
e285ecb00b
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 months ago |
|
wanglei
|
794d282385
|
修改地区代码
|
2 months ago |
|
luoyuehang
|
d8a2a4bb67
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
hnu202326010106
|
c4d595c455
|
修改地区代码
|
2 months ago |
|
wanglei
|
e4aded018e
|
修改地区代码
|
2 months ago |
|
luoyuehang
|
e5482eafd3
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
wanglei
|
dad6dce04f
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
# Conflicts:
# src/main/java/com/campus/water/controller/web/AreaController.java
|
2 months ago |
|
wanglei
|
aa72787505
|
修改地区代码
|
2 months ago |
 pc8xi2fbj
|
60ff18a220
|
Merge pull request '待审核与人工派单' (#112) from zhanghongwei_branch into develop
|
2 months ago |
|
ZHW
|
870e43ba33
|
待审核与人工派单
|
2 months ago |
|
luoyuehang
|
4400a2a936
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
p95fco63j
|
66cb45b556
|
Merge pull request '修改' (#111) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
4e8d050f83
|
修改设备地图查看功能接口
|
2 months ago |
|
luoyuehang
|
739e31a9b1
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
p95fco63j
|
2277ec7d19
|
Merge pull request '地图查看功能接口' (#110) from junmao_branch into develop
|
2 months ago |
|
tianyuan
|
24a27ed36d
|
设备地图查看功能接口
|
2 months ago |
|
luoyuehang
|
ba1db94c55
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 months ago |
|
ZHW
|
66c23806b0
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
# Conflicts:
# src/main/java/com/campus/water/service/WorkOrderServiceImpl.java
|
2 months ago |
|
hnu202326010106
|
916937b876
|
Merge pull request '修改人工派单代码' (#109) from wanglei_branch into develop
|
2 months ago |
|
wanglei
|
c5ac5a3645
|
修改人工派单代码
|
2 months ago |
|
wanglei
|
7def7464cc
|
Merge remote-tracking branch 'origin/develop' into wanglei_branch
|
2 months ago |
|
p95fco63j
|
f765bf89c4
|
Merge pull request '被派单通知接口' (#108) from junmao_branch into develop
|
2 months ago |
