Commit Graph

Select branches

Hide Pull Requests

develop

jingyou_branch

junmao_branch

luoyuehang_branch

main

wanglei_branch

zhanghongwei_branch

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• c0969db113 Merge pull request '最终版' (#176) from develop into main main p95fco63j 2026-01-12 00:29:56 +0800
• dc0829a457 Merge pull request '最终版' (#175) from zhanghongwei_branch into develop #176 develop pc8xi2fbj 2026-01-12 00:29:37 +0800
• b472e87ef2 用例文档最终稿 tianyuan 2026-01-10 14:03:02 +0800
• 2143cd1385 用例文档最终稿 tianyuan 2026-01-10 13:56:12 +0800
• 6cebddb7b1 优化 #175 zhanghongwei_branch ZHW 2026-01-07 08:39:14 +0800
• 60d9c085d8 Merge pull request '1.0' (#174) from zhanghongwei_branch into develop pc8xi2fbj 2026-01-07 08:11:37 +0800
• d8b2edce9e 需求规格说明书 tianyuan 2026-01-07 00:05:06 +0800
• 385a7f61f2 修改用例命名符合主谓宾规范 tianyuan 2026-01-06 23:28:47 +0800
• d3bc9a28f5 优化 #174 ZHW 2026-01-06 19:10:19 +0800
• 5c85ec0fd9 测试报告与需求文档 tianyuan 2026-01-05 21:29:40 +0800
• 19d62700ae Merge pull request '王磊-第十五周周总结' (#173) from wanglei_branch into develop hnu202326010106 2026-01-05 21:25:44 +0800
• 3f9eea9469 罗月航15周周总结 luoyuehang 2026-01-05 21:25:17 +0800
• 75d5430bb8 王磊-第十五周周总结 #173 wanglei_branch wanglei 2026-01-05 21:24:52 +0800
• 128d05846a 周竞由的15周周总结 周竞由 2026-01-05 21:20:14 +0800
• e727d9df66 罗月航15周周总结 luoyuehang 2026-01-05 21:18:50 +0800
• 7a6448d105 片区管理员信息和管理员片区信息 ZHW 2026-01-05 21:17:45 +0800
• 087f84a653 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch luoyuehang 2026-01-05 21:17:21 +0800
• ee31451b51 罗月航15周周总结 luoyuehang 2026-01-05 21:16:39 +0800
• dff590211b 张红卫第十五周总结 ZHW 2026-01-05 21:16:37 +0800
• 5b849e208c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2026-01-05 21:09:36 +0800
• 34689d1201 第十五周总结 tianyuan 2026-01-05 21:08:35 +0800
• 8e351191c3 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2026-01-04 22:35:17 +0800
• 44fbd0af6e Merge pull request '新增查询功能' (#172) from wanglei_branch into develop hnu202326010106 2026-01-04 22:33:21 +0800
• df2729026d 新增查询功能 #172 wanglei 2026-01-04 22:32:56 +0800
• db44ffd0e8 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2026-01-04 22:23:48 +0800
• 6c530a5c63 片区选择负责人优化 ZHW 2026-01-04 22:07:51 +0800
• 230a58494f 去掉管理员的状态 ZHW 2026-01-04 21:33:03 +0800
• 76cd37aa1a 去掉管理员的状态 ZHW 2026-01-04 17:32:12 +0800
• 8e616c55f8 去掉管理员的状态 ZHW 2026-01-04 17:02:38 +0800
• 91d93397e9 终端机关联供水机 ZHW 2026-01-04 16:45:05 +0800
• 6f409e5494 Merge pull request 'app修改' (#171) from luoyuehang_branch into develop hnu202326010125 2026-01-04 12:51:23 +0800
• 3aefd99d64 设备筛选 ZHW 2026-01-04 12:44:30 +0800
• 964289356d app1\2 样式修改 #171 luoyuehang_branch luoyuehang 2026-01-04 11:39:38 +0800
• 8d2a8a6a6a Merge pull request 'app2的扫码' (#170) from luoyuehang_branch into develop hnu202326010125 2026-01-03 22:41:14 +0800
• c32a325481 app2手机端的扫码 #170 luoyuehang 2026-01-03 22:38:26 +0800
• 9d4ed52fab Merge remote-tracking branch 'origin/develop' into luoyuehang_branch luoyuehang 2026-01-03 22:38:11 +0800
• 8738ae04a9 设备筛选 ZHW 2026-01-03 20:21:01 +0800
• 17dc8d4140 设备筛选 ZHW 2026-01-03 17:41:30 +0800
• 7d48e38cea Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2026-01-03 15:39:21 +0800
• 9a0391aaf0 Merge pull request '修改地区功能' (#169) from wanglei_branch into develop hnu202326010106 2026-01-03 15:32:59 +0800
• 2a9a672707 修改地区功能 #169 wanglei 2026-01-03 15:32:23 +0800
• 0581649705 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2026-01-03 15:08:44 +0800
• 965f0a375b Merge pull request 'app1\2的手机端适应修改' (#168) from luoyuehang_branch into develop hnu202326010125 2026-01-03 01:06:46 +0800
• 164068a01e Merge remote-tracking branch 'origin/develop' into luoyuehang_branch luoyuehang 2026-01-03 01:05:43 +0800
• 4db4c16606 app1和app2为适应手机端的修改 #168 luoyuehang 2026-01-03 01:04:44 +0800
• 2326366fce Merge pull request '修改地区id为地区name功能' (#167) from wanglei_branch into develop hnu202326010106 2026-01-02 22:58:38 +0800
• c3059709b3 修改地区id为地区name功能 #167 wanglei 2026-01-02 22:57:55 +0800
• b3d2fe0652 设备筛选 ZHW 2026-01-02 22:49:38 +0800
• fc97d559a5 Merge pull request '设备的添加' (#166) from zhanghongwei_branch into develop pc8xi2fbj 2026-01-02 22:26:16 +0800
• 9778a086c0 设备的添加 #166 ZHW 2026-01-02 22:24:51 +0800
• 013baee5d5 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2026-01-02 21:06:15 +0800
• c339448eff Merge pull request 'cors放行app' (#165) from junmao_branch into develop p95fco63j 2026-01-02 15:46:29 +0800
• f1cfc94753 cors放行app #165 junmao_branch tianyuan 2026-01-02 15:45:15 +0800
• 3e84e74d1a Merge pull request '补充安全证书' (#164) from junmao_branch into develop p95fco63j 2026-01-02 15:18:06 +0800
• 5b8680f69e 修改为https连接 #164 tianyuan 2026-01-02 15:17:28 +0800
• d726121931 Merge pull request '修改为https连接' (#163) from junmao_branch into develop p95fco63j 2026-01-02 14:56:42 +0800
• d6521c3468 修改为https连接 #163 tianyuan 2026-01-02 14:55:55 +0800
• d9baffbb70 Merge remote-tracking branch 'origin/junmao_branch' into junmao_branch tianyuan 2026-01-02 14:53:04 +0800
• 77dfbba053 修改为https连接 tianyuan 2026-01-02 14:51:15 +0800
• 9e9b452b1b Merge remote-tracking branch 'origin/develop' into junmao_branch tianyuan 2026-01-02 01:43:09 +0800
• 67f101b0cb Merge pull request '稳定版本1' (#162) from develop into main hnu202326010125 2026-01-02 01:42:55 +0800
• feec9efb08 项目配置修改 #162 luoyuehang 2026-01-02 01:40:59 +0800
• 840bca68e8 修正配置文件 tianyuan 2026-01-02 01:32:49 +0800
• d3605bef69 Merge pull request '稳定运行版本1.0' (#161) from develop into main p95fco63j 2026-01-02 01:18:48 +0800
• 4e1161b009 软件包路径修改 tianyuan 2026-01-01 19:57:16 +0800
• 78432de553 Merge pull request '数据库设计文档' (#160) from wanglei_branch into develop #161 hnu202326010106 2025-12-31 17:51:33 +0800
• a855ba3995 数据库设计文档 #160 wanglei 2025-12-31 17:50:49 +0800
• af8120601b Merge pull request '全局异常处理完善' (#159) from jingyou_branch into develop hnu202326010122 2025-12-31 12:32:59 +0800
• 8e1ce478a5 全局异常处理完善 #159 jingyou_branch 周竞由 2025-12-31 12:31:41 +0800
• c138bc6baf Merge pull request '工具类修改' (#158) from junmao_branch into develop p95fco63j 2025-12-31 11:29:50 +0800
• af3f2ba219 工具类修改 #158 tianyuan 2025-12-31 11:28:44 +0800
• 7928fb6edb Merge pull request '校区添加' (#150) from zhanghongwei_branch into develop pc8xi2fbj 2025-12-30 19:16:09 +0800
• 720077b166 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 19:13:51 +0800
• 673b22b310 片区部分优化 #150 ZHW 2025-12-30 19:13:33 +0800
• e2d67429ac Merge pull request '创建工单时添加alert_id' (#157) from junmao_branch into develop p95fco63j 2025-12-30 18:13:09 +0800
• 0a7428bd16 创建工单时添加alert_id #157 tianyuan 2025-12-30 18:02:32 +0800
• e1ac587346 Merge pull request '去除设备统计功能' (#156) from wanglei_branch into develop hnu202326010106 2025-12-30 17:32:12 +0800
• 5c63baeeb8 去除设备统计功能 #156 wanglei 2025-12-30 17:31:31 +0800
• caaf265c92 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 17:07:17 +0800
• 2831880f06 Merge pull request '修改管理员区域功能' (#155) from wanglei_branch into develop hnu202326010106 2025-12-30 17:03:23 +0800
• 7dbe437c59 修改管理员区域功能 #155 wanglei 2025-12-30 17:02:14 +0800
• 7412949355 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 16:07:25 +0800
• a409324058 Merge pull request '修改告警地区id关联以及数据发送定时' (#154) from junmao_branch into develop p95fco63j 2025-12-30 16:03:19 +0800
• 0e0e9671ba 解决格式警告 #154 tianyuan 2025-12-30 16:02:33 +0800
• 6b17bc1721 修改告警地区id关联以及数据发送定时 tianyuan 2025-12-30 16:00:55 +0800
• 8697dc552c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 15:45:20 +0800
• 94b93593d9 Merge pull request '增加查询无负责人的区域功能' (#153) from wanglei_branch into develop hnu202326010106 2025-12-30 15:42:13 +0800
• 41fda45644 增加查询无负责人的区域功能 #153 wanglei 2025-12-30 15:41:42 +0800
• e6f086843c Merge remote-tracking branch 'origin/develop' into wanglei_branch wanglei 2025-12-30 15:41:26 +0800
• 30a85dde9c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 15:33:43 +0800
• 4ed6f75f54 Merge pull request '更改' (#152) from wanglei_branch into develop hnu202326010106 2025-12-30 15:33:38 +0800
• 17968e1458 Merge remote-tracking branch 'origin/develop' into wanglei_branch wanglei 2025-12-30 15:33:09 +0800
• e2e8eb99ea 优化功能 #152 wanglei 2025-12-30 15:32:45 +0800
• a84f365c1a Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 15:25:43 +0800
• 60a44f421f Merge pull request '优化功能' (#151) from wanglei_branch into develop hnu202326010106 2025-12-30 15:23:35 +0800
• 86dfe0da93 优化功能 #151 wanglei 2025-12-30 15:23:02 +0800
• 1d3c70776f Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 15:13:43 +0800
• 21c0738816 Merge pull request '优化添加区域管理员功能' (#149) from wanglei_branch into develop hnu202326010106 2025-12-30 15:05:18 +0800
• e25b6c9c8c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ZHW 2025-12-30 15:05:16 +0800
• 97264670fe 优化添加区域管理员功能 #149 wanglei 2025-12-30 15:04:47 +0800