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

coolstore-partner-model/src/main/java/com/cool/store/entity/RegionAreaConfigDO.java

@@ -24,6 +24,9 @@ public class RegionAreaConfigDO implements Serializable {
     @ApiModelProperty("区域ID 战区id")
     private Long regionId;
 
+    @ApiModelProperty("区域路径")
+    private String regionPath;
+
     @ApiModelProperty("意向开店区域 省市code")
     private Long wantShopAreaId;
 

coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java

@@ -150,6 +150,8 @@ public class RegionDO {
      */
     private Boolean isExternalNode;
 
+    private String thirdRegionType;
+
     public RegionDO(Long id, String name, String parentId, String groupId, Long createTime, String createName) {
         this.id = id;
         this.name = name;

coolstore-partner-model/src/main/java/com/cool/store/entity/UserAuthMappingDO.java

@@ -0,0 +1,38 @@
+package com.cool.store.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * describe:人员权限映射表
+ *
+ * @author zhouyiping
+ * @date 2020/10/10
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class UserAuthMappingDO {
+    private Long id;
+    private String userId;
+    private String mappingId;
+    private String type;
+    private String source;
+    private String createId;
+    private Long createTime;
+    private String updateId;
+    private Long updateTime;
+
+    public UserAuthMappingDO(String userId, String mappingId, String type, String source, String createId, Long createTime) {
+        this.userId = userId;
+        this.mappingId = mappingId;
+        this.type = type;
+        this.source = source;
+        this.createId = createId;
+        this.createTime = createTime;
+    }
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java

@@ -17,7 +17,7 @@ public class BaseInfoVO {
     private Long lineId;
 
     @ApiModelProperty("partnerId")
-    private Integer partnerId;
+    private String partnerId;
 
     @ApiModelProperty("线索名称")
     private String username;