Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

2023-06-20 15:59:56 +08:00
parent 1d3b44b70a 34073bbb20
commit e24ddf5b01
7 changed files with 36 additions and 7 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java
@@ -19,7 +19,7 @@ public class BlackListVO {
    private Long id;

    @ApiModelProperty("加盟商用户ID")
-    private String partnerUserId;
+    private String partnerId;

    @ApiModelProperty("加盟商用户名称")
    private String partnerUserName;