Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

2026-04-25 05:25:12 +08:00 · 2023-08-03 19:32:17 +08:00
parent e30ec8bd33 b0d56273a6
commit 9329001b87
24 changed files with 213 additions and 35 deletions
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java
@@ -25,4 +25,6 @@ public class PileAuthCardDTO {
    private String phoneNumber;

    private String verificationCode;
+
+    private String merchantId;
 }
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java
@@ -34,4 +34,6 @@ public class PileMemberBindingDTO {
     * 用户memberId
     */
    private String memberId;
+
+    private String merchantId;
 }