最终版 #176

Merged

p95fco63j merged 62 commits from develop into main

p95fco63j commented

Owner

There is no content yet.

p95fco63j added 62 commits

720077b166 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

4e1161b009 软件包路径修改

840bca68e8 修正配置文件

9e9b452b1b Merge remote-tracking branch 'origin/develop' into junmao_branch

77dfbba053 修改为https连接

d9baffbb70 Merge remote-tracking branch 'origin/junmao_branch' into junmao_branch

# Conflicts:
#	src/main/java/com/campus/water/controller/GlobalExceptionHandler.java

d6521c3468 修改为https连接

d726121931 Merge pull request '修改为https连接' (#163 ) from junmao_branch into develop

5b8680f69e 修改为https连接

3e84e74d1a Merge pull request '补充安全证书' (#164 ) from junmao_branch into develop

f1cfc94753 cors放行app

c339448eff Merge pull request 'cors放行app' (#165 ) from junmao_branch into develop

013baee5d5 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

9778a086c0 设备的添加

fc97d559a5 Merge pull request '设备的添加' (#166 ) from zhanghongwei_branch into develop

b3d2fe0652 设备筛选

c3059709b3 修改地区id为地区name功能

2326366fce Merge pull request '修改地区id为地区name功能' (#167 ) from wanglei_branch into develop

4db4c16606 app1和app2为适应手机端的修改

164068a01e Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

965f0a375b Merge pull request 'app1\2的手机端适应修改' (#168 ) from luoyuehang_branch into develop

0581649705 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

2a9a672707 修改地区功能

9a0391aaf0 Merge pull request '修改地区功能' (#169 ) from wanglei_branch into develop

7d48e38cea Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

17dc8d4140 设备筛选

8738ae04a9 设备筛选

9d4ed52fab Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

c32a325481 app2手机端的扫码

8d2a8a6a6a Merge pull request 'app2的扫码' (#170 ) from luoyuehang_branch into develop

964289356d app1\2 样式修改

3aefd99d64 设备筛选

6f409e5494 Merge pull request 'app修改' (#171 ) from luoyuehang_branch into develop

91d93397e9 终端机关联供水机

8e616c55f8 去掉管理员的状态

76cd37aa1a 去掉管理员的状态

230a58494f 去掉管理员的状态

6c530a5c63 片区选择负责人优化

db44ffd0e8 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

df2729026d 新增查询功能

44fbd0af6e Merge pull request '新增查询功能' (#172 ) from wanglei_branch into develop

8e351191c3 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

34689d1201 第十五周总结

5b849e208c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

dff590211b 张红卫第十五周总结

ee31451b51 罗月航15周周总结

087f84a653 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

7a6448d105 片区管理员信息和管理员片区信息

e727d9df66 罗月航15周周总结

128d05846a 周竞由的15周周总结

75d5430bb8 王磊-第十五周周总结

3f9eea9469 罗月航15周周总结

19d62700ae Merge pull request '王磊-第十五周周总结' (#173 ) from wanglei_branch into develop

5c85ec0fd9 测试报告与需求文档

d3bc9a28f5 优化

385a7f61f2 修改用例命名符合主谓宾规范

d8b2edce9e 需求规格说明书

60d9c085d8 Merge pull request '1.0' (#174 ) from zhanghongwei_branch into develop

6cebddb7b1 优化

2143cd1385 用例文档最终稿

b472e87ef2 用例文档最终稿

dc0829a457 Merge pull request '最终版' (#175 ) from zhanghongwei_branch into develop

p95fco63j merged commit c0969db113 into main 2 months ago

p95fco63j referenced this issue from a commit

Merge pull request '最终版' (#176) from develop into main

The pull request has been merged as c0969db113.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p95fco63j/Water_Machine_Management_System#176