 liuyunhu
|
72782fbec4
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 19:52:27 +08:00 |
|
liuyunhu
|
9327ecae1f
|
huhuhu
|
2024-04-08 19:51:32 +08:00 |
lijiayao
|
05b2baf32e
|
feat: 优化代码
|
2024-04-08 19:50:45 +08:00 |
 ffr
|
663111d885
|
upd
|
2024-04-08 09:59:48 +08:00 |
|
lijiayao
|
b4ad3e4f47
|
feat: 电子围栏报警
|
2024-04-07 21:41:38 +08:00 |
|
lijiayao
|
8de32c8223
|
Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/contents/StateConstant.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/BreakdownServiceImpl.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/MqController.java
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-06 10:02:18 +08:00 |
|
ffr
|
2f2547e2b8
|
upd commit
|
2024-04-05 20:08:18 +08:00 |
dongxiaodong
|
f81f05ae1c
|
判断异常
|
2024-04-05 08:38:19 +08:00 |
|
dongxiaodong
|
846073f528
|
删除没用的文件
|
2024-04-04 14:45:07 +08:00 |
|
lijiayao
|
2352def47e
|
refactor: 修改框架
|
2024-04-03 11:01:11 +08:00 |