Merge remote-tracking branch 'origin/master'

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>3.3.0_core_alpha5</version>
+            <version>3.3.0_core_alpha6</version>
             <!--            <version>3.0.0_nlt.25</version>-->
             <!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
         </dependency>

src/main/java/org/rcisoft/business/memInfo/entity/MemInfo.java

@@ -319,8 +319,8 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
       * @column avatar
       * @default
       */
-     @Schema(name = "avatar", description = "头像地址", required = false, type = "string")
-     private String avatar;
+     @Schema(name = "avatar", description = "头像地址", required = false)
+     private Integer avatar;
 
 
      @Schema(name = "wxOpenid", description = "微信openid", required = false, type = "string")
@@ -441,5 +441,13 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
       */
      @TableField(exist = false)
      private Integer maxAge;
+
+     /**
+      * @desc 头像地址
+      * @column avatar
+      * @default
+      */
+     @TableField(exist = false)
+     private String avatarUrl;
 }
 

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -104,7 +104,7 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         userRbac.setFlag(CyFlagStaCons.NORMAL.getStatus());
         userRbac.setDelFlag(CyDelStaCons.NORMAL.getStatus());
         userRbac.setWxOpenid(memInfo.getWxOpenid());
-        userRbac.setAvatar(memInfo.getAvatar());
+//        userRbac.setAvatar(memInfo.getAvatar());
         userRbac.setNickName(memInfo.getMemNickName());
         sysUserRbacRepository.insert(userRbac);
         //查询会员角色
@@ -184,7 +184,7 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         userRbac.setPhone(memInfo.getMemPhone());
         userRbac.setSex(memInfo.getMemSex());
         userRbac.setIdNumber(memInfo.getMemIdcard());
-        userRbac.setAvatar(memInfo.getAvatar());
+//        userRbac.setAvatar(memInfo.getAvatar());
         userRbac.setNickName(memInfo.getMemNickName());
         sysUserRbacRepository.updateById(userRbac);
         int line = baseMapper.updateById(memInfo);