Commit Graph

232 Commits (dcc6def480b23e1521d71ff1ac79100d6fc2254a)

Author SHA1 Message Date
ffr e270770029 fufanruiCommit 2024-04-08 10:55:33 +08:00
liuyunhu cf9727981e Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-08 10:03:04 +08:00
liuyunhu 01c11cea01 4.8增加set缓存 车辆vin 标识 2024-04-08 10:02:52 +08:00
lijiayao 366d97e8d2 feat: 电子围栏报警 2024-04-08 10:02:19 +08:00
lijiayao 4ad3cfbe8e Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-08 10:01:23 +08:00
lijiayao d0e00acaeb Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-08 10:00:28 +08:00
lijiayao 325b13df58 feat: 电子围栏报警 2024-04-08 10:00:10 +08:00
ffr 663111d885 upd 2024-04-08 09:59:48 +08:00
dongxiaodong f104a50c27 Merge remote-tracking branch 'origin/server_five' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
2024-04-08 09:21:25 +08:00
dongxiaodong 0eba9f5cfe 存储数据 2024-04-08 09:15:52 +08:00
lijiayao 1c6cebb2cc feat: 电子围栏报警 2024-04-07 22:37:47 +08:00
lijiayao 16d72968d4 feat: 电子围栏报警 2024-04-07 22:37:13 +08:00
lijiayao 8bbaadea94 feat: 电子围栏报警 2024-04-07 22:32:02 +08:00
liuyunhu 78afcf9ecc 4.7提交修改bug 2024-04-07 22:29:32 +08:00
lijiayao b4ad3e4f47 feat: 电子围栏报警 2024-04-07 21:41:38 +08:00
lijiayao c4eb443372 Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
#	couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
2024-04-07 15:54:38 +08:00
lijiayao b3bc515135 Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-07 15:54:11 +08:00
liuyunhu 4e021d316b 111111 2024-04-07 15:53:55 +08:00
lijiayao 0569099b02 feat: 电子围栏报警 2024-04-07 15:53:49 +08:00
ffr 57c31b68c3 ffffff 2024-04-07 14:35:44 +08:00
liuyunhu 0774e29edd 1 2024-04-07 11:06:13 +08:00
ffr 43f51881ca ffffff 2024-04-07 11:05:59 +08:00
lijiayao e5c4c0b9a4 perf: 优化 2024-04-06 21:56:29 +08:00
lijiayao 8803a91628 Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five
# Conflicts:
#	couplet-modules/couplet-business/src/main/resources/bootstrap.yml
2024-04-06 21:54:44 +08:00
dongxiaodong b1d3443ddb 删除文件 2024-04-06 21:45:02 +08:00
dongxiaodong 65c64098ab 删除文件 2024-04-06 21:39:26 +08:00
dongxiaodong 165583d024 kafka代码 2024-04-06 21:34:23 +08:00
dongxiaodong 1e08ce9bd7 kafka代码 2024-04-06 20:50:16 +08:00
lijiayao de9f2e6a24 fix: 代码丢失找回 2024-04-06 20:08:16 +08:00
dongxiaodong d8e65c8da3 kafka代码 2024-04-06 20:08:09 +08:00
ffr 404f434d62 ffffff 2024-04-06 20:07:00 +08:00
ffr 94a0e48edc ffffff 2024-04-06 16:34:44 +08:00
lijiayao 7aa223c8e4 Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-06 16:30:45 +08:00
liuyunhu 78f59d7392 优化 2024-04-06 16:30:00 +08:00
dongxiaodong 6798b04fc4 kafka代码 2024-04-06 16:29:50 +08:00
liuyunhu b655ca9c30 打印SQL执行日志 2024-04-06 14:53:29 +08:00
liuyunhu 73342572cc 将远程调用的内容加 自动配置 2024-04-06 14:51:05 +08:00
liuyunhu 812b8d47f8 Kafka demo 2024-04-06 14:25:44 +08:00
lijiayao 957d3976b9 fix: 代码丢失找回 2024-04-06 14:09:42 +08:00
lijiayao a042d30eec Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-06 14:09:35 +08:00
ffr fe7a832714 1111 2024-04-06 11:50:56 +08:00
liuyunhu 858acc75ee Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
#	couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java
#	couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml
#	couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqConsumer.java
2024-04-06 11:38:24 +08:00
liuyunhu e885895016 VS 2024-04-06 11:37:22 +08:00
ffr 1091b79e56 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-06 11:37:05 +08:00
lijiayao 5a20331f8d fix: 代码丢失找回 2024-04-06 11:36:04 +08:00
lijiayao be3fd8e7eb Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-06 11:27:15 +08:00
dongxiaodong 10b15a6f99 修改故障类 2024-04-06 11:08:41 +08:00
ffr 676f4fa8f3 1111 2024-04-06 11:03:16 +08:00
liuyunhu 9b0121446a Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-06 10:56:16 +08:00
liuyunhu 64caa2296c 11 2024-04-06 10:56:05 +08:00