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-common/src/main/java/com/jsowell/common/core/domain/ykc/GroundLockData.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/GroundLockData.java
@@ -13,6 +13,11 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@Builder
 public class GroundLockData {
+    /**
+     * 时间
+     */
+    private String time;
+
    /**
     * 充电桩编号
     */