Commit Graph

95 Commits (b8a8373ba5ae38ce80247d133a429896b41ca706)

Author SHA1 Message Date
刘武 b8a8373ba5 saas 优化 2024-09-26 19:54:47 +08:00
刘武 4ff91624fe saas 优化 2024-09-26 19:02:30 +08:00
刘武 0595237e8b saas 优化 2024-09-26 15:26:07 +08:00
刘武 981706944a saas 优化 2024-09-25 22:44:44 +08:00
刘武 0930eabf51 项目整合 初始化 2024-09-25 10:22:23 +08:00
刘武 2da914c305 项目整合 初始化 2024-09-25 10:17:53 +08:00
刘武 4a2d419360 项目整合 初始化 2024-09-25 10:12:30 +08:00
刘武 6272836d8a 项目整合 2024-09-25 09:56:06 +08:00
刘武 aa4fb95497 项目整合 2024-09-25 09:50:26 +08:00
刘武 ede54c3762 Merge remote-tracking branch 'origin/dev.fence'
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-breakdown/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java
#	cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
#	cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
2024-09-25 09:50:09 +08:00
刘武 d1338d9e65 项目整合 2024-09-25 09:48:26 +08:00
刘武 b882cb0c01 项目整合 2024-09-25 09:47:55 +08:00
刘武 ec9ebde88c Merge branch 'dev.breakdown' 2024-09-25 09:47:29 +08:00
刘武 15815129bd 项目整合 2024-09-25 09:43:10 +08:00
刘武 4e0562aa3b 项目整合 2024-09-25 09:38:48 +08:00
刘武 7e3ae3b7b6 Merge remote-tracking branch 'origin/dev.saas' 2024-09-25 09:36:51 +08:00
86191 adafb3248c fix():重构电子围栏以及围栏组 2024-09-25 09:36:37 +08:00
刘武 9b0f24bff3 saas模块更新 2024-09-25 09:35:16 +08:00
Number7 d53193eb4b 更新 2024-09-25 09:34:56 +08:00
86191 ffc698bc11 fix():重构电子围栏以及围栏组 2024-09-24 11:13:34 +08:00
刘武 895a4efab3 saas模块更新 2024-09-24 10:40:34 +08:00
Number7 bef61a5d29 报文模块删除冗余的代码 2024-09-24 10:02:32 +08:00
SuiXxx 9e0e3f37b8 feat():修改车辆管理 2024-09-24 09:59:52 +08:00
SuiXxx 154b26d7a6 feat():修改车辆管理 2024-09-24 09:58:07 +08:00
袁子龙 1f7dc72f8d test:故障记录展示数据修改 2024-09-24 00:20:27 +08:00
刘武 fce189d87f saas模块更新 2024-09-23 23:24:46 +08:00
袁子龙 08b4d720d8 test:故障记录展示数据修改 2024-09-23 21:07:32 +08:00
袁子龙 efb50cff22 test:故障记录展示数据修改 2024-09-23 21:05:45 +08:00
袁子龙 c13bf9528c test:故障记录展示数据修改 2024-09-23 20:56:10 +08:00
SuiXxx f4772c7799 feat():预警修改 2024-09-23 20:19:38 +08:00
Number7 c0d8b91e04 Merge remote-tracking branch 'refs/remotes/origin/dev.template' 2024-09-23 19:43:21 +08:00
Number7 310f8023af 对车辆故障接口进行修改 2024-09-23 19:42:25 +08:00
86191 0619a5102c fix():重构电子围栏以及围栏组 2024-09-23 19:35:19 +08:00
刘武 c29fa2fa1f 车辆管理更新 2024-09-23 19:00:10 +08:00
袁子龙 2b4111fccd chore:yml文件修改(nacos命名空间名称) 2024-09-23 12:02:22 +08:00
刘武 adcf07d469 Merge branch 'dev.fence' 2024-09-23 10:36:42 +08:00
86191 b66e38d021 feat():查询围栏组 2024-09-23 10:26:38 +08:00
袁子龙 fc78229b0b feat:故障记录添加 2024-09-22 22:37:38 +08:00
袁子龙 24f84b74cf feat:故障记录添加 2024-09-22 22:34:12 +08:00
袁子龙 47a67d40c7 feat:故障记录展示 2024-09-22 22:31:04 +08:00
Number7 5a149dc87f 添加车辆查看故障接口 2024-09-22 22:05:36 +08:00
袁子龙 1facc25586 feat:故障记录展示 2024-09-22 21:25:54 +08:00
Number7 f6c9db3a2a 添加车辆查看故障接口 2024-09-22 20:47:23 +08:00
86191 25e2a67512 feat():查询围栏组 2024-09-22 19:28:28 +08:00
SuiXxx e7e9f73ef5 feat():新增预警方法 2024-09-22 19:19:57 +08:00
袁子龙 a40653dc4d feat:站内信展示 2024-09-22 16:48:26 +08:00
SuiXxx bdf77f24a4 feat():预警 2024-09-22 11:36:50 +08:00
SuiXxx 6d2f00360b Merge remote-tracking branch 'origin/dev.warn'
# Conflicts:
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarLogController.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java
#	cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java
#	cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
2024-09-22 11:35:19 +08:00
SuiXxx e48a7cf352 feat():添加查询车辆类型方法 2024-09-22 11:32:13 +08:00
SuiXxx cf7c7efddd feat():预警 2024-09-22 11:20:14 +08:00