Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/AppVersionInfo.java

@@ -36,7 +36,15 @@ public class AppVersionInfo {
 	
 	/**  */
 	private java.util.Date createTime;
-	
+
+	public boolean isForceUpdate() {
+		return isForceUpdate;
+	}
+
+	public void setForceUpdate(boolean forceUpdate) {
+		isForceUpdate = forceUpdate;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -73,7 +81,7 @@ public class AppVersionInfo {
 		this.isForceUpdate = isForceUpdate;
 	}
 	
-	public boolean isIsForceUpdate(){
+	public boolean getIsForceUpdate(){
 		return this.isForceUpdate;
 	}
 			

mec-biz/src/main/resources/config/mybatis/AppVersionInfoMapper.xml

@@ -3,12 +3,12 @@
 <!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.biz.dal.dao.AppVersionInfoDao">
 
-	<resultMap type="com.ym.mec.biz.dal.entity.AppVersionInfo"
-		id="AppVersionInfo">
+	<resultMap type="com.ym.mec.biz.dal.entity.AppVersionInfo" id="AppVersionInfo">
 		<result column="id_" property="id" />
 		<result column="platform_" property="platform" />
 		<result column="version_" property="version" />
 		<result column="status_" property="status" />
+		<result column="is_force_update_" property="isForceUpdate" />
 		<result column="description_" property="description" />
 		<result column="download_url_" property="downloadUrl" />
 		<result column="operator_id_" property="operatorId" />