Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -37,7 +37,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
 
     //更新会员信息
     @Override
-    @CacheClear(key = "user:member{1.userid}")
+    @CacheClear(key = "user:member{1.userId}")
     public  void  updateSelectiveById(BaseUserMember userMember){  super.updateSelectiveById(userMember);}
 
 

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

@@ -11,6 +11,8 @@
         <result property="memberLevel" column="member_level"/>
         <result property="cardLeave" column="card_leave"/>
         <result property="isBind" column="is_bind"/>
+        <result property="payCount" column="pay_count"/>
+        <result property="buyCount" column="buy_count"/>
         <result property="totalNumber" column="total_number"/>
         <result property="rentFreeDays" column="rent_free_days"/>
         <result property="validTime" column="valid_time"/>

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/AppVersion.java

@@ -74,6 +74,13 @@ public class AppVersion implements Serializable {
     @Column(name = "download_switch")
 	@ApiModelProperty(value = "下载开关（0：可下载，1：不可下载）")
     private Integer downloadSwitch;
+	/**
+	 *  下载开关（0：可下载，1：不可下载）
+	 */
+	@Column(name = "is_compel")
+	@ApiModelProperty(value = "是否强制:0-否；1-是")
+	private Integer isCompel;
+
 	
 	    /**
      *  权重