From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java
index ee29f01..6dbacd2 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java
@@ -18,18 +18,30 @@
 @ApiModel("寰俊鎺堟潈鎵嬫満鍙疯姹傜被")
 public class WxPhoneRequest implements Serializable {
 
-    @NotEmpty(message = "encryptedData 涓嶈兘涓虹┖")
-    @ApiModelProperty(value = "encryptedData")
-    private String encryptedData;
+//    @NotEmpty(message = "encryptedData 涓嶈兘涓虹┖")
+//    @ApiModelProperty(value = "encryptedData")
+//    private String encryptedData;
+//
+//    @NotEmpty(message = "iv 涓嶈兘涓虹┖")
+//    @ApiModelProperty(value = "iv")
+//    private String iv;
+//
+//    @NotEmpty(message = "sessionKey 涓嶈兘涓虹┖")
+//    @ApiModelProperty(value = "sessionKey")
+//    private String sessionKey;
 
-    @NotEmpty(message = "iv 涓嶈兘涓虹┖")
-    @ApiModelProperty(value = "iv")
-    private String iv;
+    @NotEmpty(message = "openid 涓嶈兘涓虹┖")
+    @ApiModelProperty(value = "openid")
+    private String openid;
 
-    @NotEmpty(message = "sessionKey 涓嶈兘涓虹┖")
-    @ApiModelProperty(value = "sessionKey")
-    private String sessionKey;
+    @NotEmpty(message = "code 涓嶈兘涓虹┖")
+    @ApiModelProperty(value = "code")
+    private String code;
 
-    private Integer memberId;
 
+    @ApiModelProperty(value = "閭�璇风爜")
+    private Integer recId;
+
+    @ApiModelProperty(value = "鍟嗘埛涓婚敭")
+    private Integer shopId;
 }

--
Gitblit v1.9.3