Merge branch 'dev' into merge_adapay

# Conflicts: # jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java # jsowell-admin/src/main/resources/application-dev.yml
2026-04-21 03:25:12 +08:00 · 2023-09-08 15:48:57 +08:00
parent 7cc8563de6 cc1fd3fafd
commit aa345ee629
35 changed files with 3083 additions and 168 deletions
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java
@@ -97,6 +97,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
                .parkingStatus(parkingStatus)
                .groundLockElectric(groundLockElectric)
                .alarmStatus(alarmStatus)
+                .time(DateUtils.getTime())
                .build();

        // 地锁信息放缓存中 缓存10分钟