Commit Graph

30 Commits (5b1c1a27a9ac14dbce411430a7b1ffa83abc9ccd)

Author SHA1 Message Date
Yueng 5b1c1a27a9 Merge branch 'dev.yang' 2024-09-27 11:01:15 +08:00
Aaaaaaaa 22b3d12010 Merge remote-tracking branch 'origin/dev.xxy'
# Conflicts:
#	cloud-modules/pom.xml
2024-09-26 15:18:21 +08:00
Aaaaaaaa f6c1de2c6b 车辆管理 2024-09-26 15:05:48 +08:00
Yueng 29c84f90ef Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev.yang
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-common/pom.xml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	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-26 14:57:53 +08:00
niuwu666 49fe2961f0 Merge pull request 'saas1提交' (#2) from dev.zhang into master
Reviewed-on: #2
2024-09-26 14:46:44 +08:00
张腾 262899c57e saas1提交 2024-09-26 14:34:09 +08:00
weiran 25ad7f9da0 删除 cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml 2024-09-26 10:13:24 +08:00
weiran 01aaf7f926 删除 cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml 2024-09-26 10:12:37 +08:00
weiran 1185868ce5 删除 cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml 2024-09-26 10:12:18 +08:00
weiran 0c7287f19d 删除 cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml 2024-09-26 10:12:03 +08:00
weiran 803ea0fe80 删除 cloud-gateway/src/main/resources/bootstrap.yml 2024-09-26 10:11:14 +08:00
weiran 59b64e816c 删除 cloud-auth/src/main/resources/bootstrap.yml 2024-09-26 10:10:38 +08:00
Aaaaaaaa 4a094775d4 报文管理 2024-09-25 22:44:25 +08:00
niuwu666 67988ff16f Merge pull request 'saas初始' (#1) from dev.zhang into master
Reviewed-on: #1
2024-09-25 20:24:04 +08:00
张腾 6d682e1423 saas初始 2024-09-25 20:22:59 +08:00
Yueng 178d4966b5 Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev.yang
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-common/pom.xml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	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 19:54:42 +08:00
Yueng c174e8adab 添加解绑操作 2024-09-25 19:53:11 +08:00
Yueng 10981bc80d 查询中间表,添加车辆中间表围栏组围栏表信息 2024-09-24 11:08:21 +08:00
Aaaaaaaa 15b99b27c4 报文管理 2024-09-24 10:11:43 +08:00
Aaaaaaaa e8377904b5 报文管理 2024-09-22 09:37:52 +08:00
Aaaaaaaa b227854496 车辆管理/报文 二次修改 2024-09-23 00:25:45 +08:00
Yueng 41918d6303 初始化 2024-09-21 20:47:42 +08:00
Yueng 86eb16420b 初始化 2024-09-21 20:47:11 +08:00
Aaaaaaaa 6f17adbcf3 Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev.xxy
# Conflicts:
#	cloud-modules/pom.xml
2024-09-21 12:06:05 +08:00
Aaaaaaaa 97d5dac0a2 车辆管理/报文基础设置 2024-09-21 12:04:04 +08:00
张腾 0a01ca8497 初始化 2024-09-21 11:52:20 +08:00
张腾 14da1917c3 初始化 2024-09-19 21:07:54 +08:00
Aaaaaaaa f07a9bd208 车辆管理基础业务实体类 2024-09-18 20:58:51 +08:00
Aaaaaaaa 3c7ba5744d 车辆管理基础设置 2024-09-18 19:16:32 +08:00
张腾 fac31cb7a8 初始化 2024-09-14 17:47:45 +08:00