 wanglei
|
75d5430bb8
|
王磊-第十五周周总结
|
1 week ago |
 周竞由
|
128d05846a
|
周竞由的15周周总结
|
1 week ago |
 luoyuehang
|
e727d9df66
|
罗月航15周周总结
|
1 week ago |
|
luoyuehang
|
087f84a653
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
1 week ago |
|
luoyuehang
|
ee31451b51
|
罗月航15周周总结
|
1 week ago |
 ZHW
|
dff590211b
|
张红卫第十五周总结
|
1 week ago |
|
ZHW
|
5b849e208c
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
1 week ago |
 tianyuan
|
34689d1201
|
第十五周总结
|
1 week ago |
|
ZHW
|
8e351191c3
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
hnu202326010106
|
44fbd0af6e
|
Merge pull request '新增查询功能' (#172) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
df2729026d
|
新增查询功能
|
2 weeks ago |
|
ZHW
|
db44ffd0e8
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
ZHW
|
6c530a5c63
|
片区选择负责人优化
|
2 weeks ago |
|
ZHW
|
230a58494f
|
去掉管理员的状态
|
2 weeks ago |
|
ZHW
|
76cd37aa1a
|
去掉管理员的状态
|
2 weeks ago |
|
ZHW
|
8e616c55f8
|
去掉管理员的状态
|
2 weeks ago |
|
ZHW
|
91d93397e9
|
终端机关联供水机
|
2 weeks ago |
|
hnu202326010125
|
6f409e5494
|
Merge pull request 'app修改' (#171) from luoyuehang_branch into develop
|
2 weeks ago |
|
ZHW
|
3aefd99d64
|
设备筛选
|
2 weeks ago |
|
luoyuehang
|
964289356d
|
app1\2 样式修改
|
2 weeks ago |
|
hnu202326010125
|
8d2a8a6a6a
|
Merge pull request 'app2的扫码' (#170) from luoyuehang_branch into develop
|
2 weeks ago |
|
luoyuehang
|
c32a325481
|
app2手机端的扫码
|
2 weeks ago |
|
luoyuehang
|
9d4ed52fab
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
|
ZHW
|
8738ae04a9
|
设备筛选
|
2 weeks ago |
|
ZHW
|
17dc8d4140
|
设备筛选
|
2 weeks ago |
|
ZHW
|
7d48e38cea
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
hnu202326010106
|
9a0391aaf0
|
Merge pull request '修改地区功能' (#169) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
2a9a672707
|
修改地区功能
|
2 weeks ago |
|
ZHW
|
0581649705
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
hnu202326010125
|
965f0a375b
|
Merge pull request 'app1\2的手机端适应修改' (#168) from luoyuehang_branch into develop
|
2 weeks ago |
|
luoyuehang
|
164068a01e
|
Merge remote-tracking branch 'origin/develop' into luoyuehang_branch
|
2 weeks ago |
|
luoyuehang
|
4db4c16606
|
app1和app2为适应手机端的修改
|
2 weeks ago |
|
hnu202326010106
|
2326366fce
|
Merge pull request '修改地区id为地区name功能' (#167) from wanglei_branch into develop
|
2 weeks ago |
|
wanglei
|
c3059709b3
|
修改地区id为地区name功能
|
2 weeks ago |
|
ZHW
|
b3d2fe0652
|
设备筛选
|
2 weeks ago |
|
pc8xi2fbj
|
fc97d559a5
|
Merge pull request '设备的添加' (#166) from zhanghongwei_branch into develop
|
2 weeks ago |
|
ZHW
|
9778a086c0
|
设备的添加
|
2 weeks ago |
|
ZHW
|
013baee5d5
|
Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch
|
2 weeks ago |
|
p95fco63j
|
c339448eff
|
Merge pull request 'cors放行app' (#165) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
f1cfc94753
|
cors放行app
|
2 weeks ago |
|
p95fco63j
|
3e84e74d1a
|
Merge pull request '补充安全证书' (#164) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
5b8680f69e
|
修改为https连接
|
2 weeks ago |
|
p95fco63j
|
d726121931
|
Merge pull request '修改为https连接' (#163) from junmao_branch into develop
|
2 weeks ago |
|
tianyuan
|
d6521c3468
|
修改为https连接
|
2 weeks ago |
|
tianyuan
|
d9baffbb70
|
Merge remote-tracking branch 'origin/junmao_branch' into junmao_branch
# Conflicts:
# src/main/java/com/campus/water/controller/GlobalExceptionHandler.java
|
2 weeks ago |
|
tianyuan
|
77dfbba053
|
修改为https连接
|
2 weeks 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 |
