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

src/main/resources/mappings/modules/miniprogram/CmMiniProgramUserMapper.xml

@@ -12,23 +12,12 @@
 		a.bindMobile AS "bindMobile",
 		a.image AS "image",
 		a.password AS "password",
-		a.userLevelID AS "userLevelID",
 		a.name AS "name",
 		a.realName AS "realName",
-		a.nick AS "nick",
-		a.sex AS "sex",
 		a.userIdentity AS "userIdentity",
 		a.registerUserTypeID AS "registerUserTypeID",
-		a.companyUserID AS "companyUserID",
-		a.openID AS "openID",
-		a.manufacturerFlag AS "manufacturerFlag",
 		a.manufacturerStatus AS "manufacturerStatus",
-		a.upgradeBy AS "upgradeBy",
 		a.shopID AS "shopID",
-		a.serviceProviderFlag AS "serviceProviderFlag",
-		a.clubFlag AS "clubFlag",
-		a.masterFlag AS "masterFlag",
-		a.normalFlag AS "normalFlag",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
@@ -37,47 +26,20 @@
 		a.loginTime AS "loginTime",
 		a.loginIP AS "loginIP",
 		a.validFlag AS "validFlag",
-		a.emailCheckFlag AS "emailCheckFlag",
-		a.mobileCheckFlag AS "mobileCheckFlag",
 		a.clubStatus AS "clubStatus",
 		a.clubID AS "clubID",
 		a.agreeFlag AS "agreeFlag",
-		a.activationCode AS "activationCode",
-		a.activationDate AS "activationDate",
 		a.serviceProviderStatus AS "serviceProviderStatus",
 		a.serviceProviderID AS "serviceProviderID",
-		a.masterStatus AS "masterStatus",
-		a.masterID AS "masterID",
 		a.userMoney AS "userMoney",
-		a.point AS "point",
-		a.shopERPFlag AS "shopERPFlag",
-		a.fromUserID AS "fromUserID",
-		a.fromUserName AS "fromUserName",
 		a.logoffTime AS "logoffTime",
 		a.appKey AS "appKey",
 		a.appSecret AS "appSecret",
-		a.sampleFlag AS "sampleFlag",
 		a.scanFlag AS "scanFlag",
-		a.sysroleid AS "sysroleid",
-		a.gender AS "gender",
-		a.age AS "age",
-		a.salerbuyer AS "salerbuyer",
-		a.position AS "position",
-		a.skill AS "skill",
-		a.workage AS "workage",
-		a.wechat AS "wechat",
-		a.qq AS "qq",
-		a.smsFlag AS "smsFlag",
 		a.userBeans AS "userBeans",
-		a.privateShopFlag AS "privateShopFlag",
-		a.privateClubFlag AS "privateClubFlag",
-		a.isMeiDaoAuthorized AS "isMeiDaoAuthorized",
 		a.guideFlag AS "guideFlag",
 		a.loginFailTime AS "loginFailTime",
-		a.tipStatus AS "tipStatus",
-		a.applyTime AS "applyTime",
-		a.miniProgramOpenId AS "miniProgramOpenId",
-		a.miniProgramId AS "miniProgramId"
+		a.tipStatus AS "tipStatus"
 	</sql>
 
 	<sql id="cmMiniProgramUserJoins">
@@ -140,23 +102,12 @@
 			bindMobile,
 			image,
 			password,
-			userLevelID,
 			name,
 			realName,
-			nick,
-			sex,
 			userIdentity,
 			registerUserTypeID,
-			companyUserID,
-			openID,
-			manufacturerFlag,
 			manufacturerStatus,
-			upgradeBy,
 			shopID,
-			serviceProviderFlag,
-			clubFlag,
-			masterFlag,
-			normalFlag,
 			auditStatus,
 			auditTime,
 			auditNote,
@@ -165,46 +116,19 @@
 			loginTime,
 			loginIP,
 			validFlag,
-			emailCheckFlag,
-			mobileCheckFlag,
 			clubStatus,
 			clubID,
 			agreeFlag,
-			activationCode,
-			activationDate,
 			serviceProviderStatus,
 			serviceProviderID,
-			masterStatus,
-			masterID,
 			userMoney,
-			point,
-			shopERPFlag,
-			fromUserID,
-			fromUserName,
 			logoffTime,
 			appKey,
 			appSecret,
-			sampleFlag,
 			scanFlag,
-			sysroleid,
-			gender,
-			age,
-			salerbuyer,
-			position,
-			skill,
-			workage,
-			wechat,
-			qq,
-			smsFlag,
 			userBeans,
-			privateShopFlag,
-			privateClubFlag,
-			isMeiDaoAuthorized,
 			loginFailTime,
-			tipStatus,
-			applyTime,
-			miniProgramOpenId,
-			miniProgramId
+			tipStatus
 		) VALUES (
 			#{account},
 			#{mobile},
@@ -214,23 +138,12 @@
 			#{bindMobile},
 			#{image},
 			#{password},
-			#{userLevelID},
 			#{name},
 			#{realName},
-			#{nick},
-			#{sex},
 			#{userIdentity},
 			#{registerUserTypeID},
-			#{companyUserID},
-			#{openID},
-			#{manufacturerFlag},
 			#{manufacturerStatus},
-			#{upgradeBy},
 			#{shopID},
-			#{serviceProviderFlag},
-			#{clubFlag},
-			#{masterFlag},
-			#{normalFlag},
 			#{auditStatus},
 			#{auditTime},
 			#{auditNote},
@@ -239,46 +152,18 @@
 			#{loginTime},
 			#{loginIP},
 			#{validFlag},
-			#{emailCheckFlag},
-			#{mobileCheckFlag},
 			#{clubStatus},
 			#{clubID},
 			#{agreeFlag},
-			#{activationCode},
-			#{activationDate},
 			#{serviceProviderStatus},
 			#{serviceProviderID},
-			#{masterStatus},
-			#{masterID},
 			#{userMoney},
-			#{point},
-			#{shopERPFlag},
-			#{fromUserID},
-			#{fromUserName},
-			#{logoffTime},
 			#{appKey},
 			#{appSecret},
-			#{sampleFlag},
 			#{scanFlag},
-			#{sysroleid},
-			#{gender},
-			#{age},
-			#{salerbuyer},
-			#{position},
-			#{skill},
-			#{workage},
-			#{wechat},
-			#{qq},
-			#{smsFlag},
 			#{userBeans},
-			#{privateShopFlag},
-			#{privateClubFlag},
-			#{isMeiDaoAuthorized},
 			#{loginFailTime},
-			#{tipStatus},
-			#{applyTime},
-			#{miniProgramOpenId},
-			#{miniProgramId}
+			#{tipStatus}
 		)
 	</insert>
 
@@ -292,23 +177,12 @@
 			bindMobile = #{bindMobile},
 			image = #{image},
 			password = #{password},
-			userLevelID = #{userLevelID},
 			name = #{name},
 			realName = #{realName},
-			nick = #{nick},
-			sex = #{sex},
 			userIdentity = #{userIdentity},
 			registerUserTypeID = #{registerUserTypeID},
-			companyUserID = #{companyUserID},
-			openID = #{openID},
-			manufacturerFlag = #{manufacturerFlag},
 			manufacturerStatus = #{manufacturerStatus},
-			upgradeBy = #{upgradeBy},
 			shopID = #{shopID},
-			serviceProviderFlag = #{serviceProviderFlag},
-			clubFlag = #{clubFlag},
-			masterFlag = #{masterFlag},
-			normalFlag = #{normalFlag},
 			auditStatus = #{auditStatus},
 			auditTime = #{auditTime},
 			auditNote = #{auditNote},
@@ -317,47 +191,20 @@
 			loginTime = #{loginTime},
 			loginIP = #{loginIP},
 			validFlag = #{validFlag},
-			emailCheckFlag = #{emailCheckFlag},
-			mobileCheckFlag = #{mobileCheckFlag},
 			clubStatus = #{clubStatus},
 			clubID = #{clubID},
 			agreeFlag = #{agreeFlag},
-			activationCode = #{activationCode},
-			activationDate = #{activationDate},
 			serviceProviderStatus = #{serviceProviderStatus},
 			serviceProviderID = #{serviceProviderID},
-			masterStatus = #{masterStatus},
-			masterID = #{masterID},
 			userMoney = #{userMoney},
-			point = #{point},
-			shopERPFlag = #{shopERPFlag},
-			fromUserID = #{fromUserID},
-			fromUserName = #{fromUserName},
 			logoffTime = #{logoffTime},
 			appKey = #{appKey},
 			appSecret = #{appSecret},
-			sampleFlag = #{sampleFlag},
 			scanFlag = #{scanFlag},
-			sysroleid = #{sysroleid},
-			gender = #{gender},
-			age = #{age},
-			salerbuyer = #{salerbuyer},
-			position = #{position},
-			skill = #{skill},
-			workage = #{workage},
-			wechat = #{wechat},
-			qq = #{qq},
-			smsFlag = #{smsFlag},
 			userBeans = #{userBeans},
-			privateShopFlag = #{privateShopFlag},
-			privateClubFlag = #{privateClubFlag},
-			isMeiDaoAuthorized = #{isMeiDaoAuthorized},
 			guideFlag = #{guideFlag},
 			loginFailTime = #{loginFailTime},
-			tipStatus = #{tipStatus},
-			applyTime = #{applyTime},
-			miniProgramOpenId = #{miniProgramOpenId},
-			miniProgramId = #{miniProgramId}
+			tipStatus = #{tipStatus}
 		WHERE userID = #{userID}
 	</update>
 

src/main/resources/mappings/modules/user/CmNormalUserMapper.xml

@@ -8,25 +8,15 @@
 		a.bindMobile AS "bindMobile",
 		a.realName AS "realName",
 		a.userIdentity AS "userIdentity",
-		a.companyUserID AS "companyUserID",
-		a.openID AS "openID",
 		a.mobile AS "mobile",
 		a.email AS "email",
 		a.userName AS "userName",
 		a.image AS "image",
 		a.password AS "password",
-		a.userLevelID AS "userLevelID",
 		a.name AS "name",
-		a.nick AS "nick",
-		a.sex AS "sex",
 		a.registerUserTypeID AS "registerUserTypeID",
-		a.manufacturerFlag AS "manufacturerFlag",
 		a.manufacturerStatus AS "manufacturerStatus",
 		a.shopID AS "shopID",
-		a.serviceProviderFlag AS "serviceProviderFlag",
-		a.clubFlag AS "clubFlag",
-		a.masterFlag AS "masterFlag",
-		a.normalFlag AS "normalFlag",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
@@ -36,42 +26,18 @@
 		a.loginFailTime AS "loginFailTime",
 		a.loginIP AS "loginIP",
 		a.validFlag AS "validFlag",
-		a.emailCheckFlag AS "emailCheckFlag",
-		a.mobileCheckFlag AS "mobileCheckFlag",
 		a.clubStatus AS "clubStatus",
 		a.clubID AS "clubID",
 		a.agreeFlag AS "agreeFlag",
-		a.activationCode AS "activationCode",
-		a.activationDate AS "activationDate",
 		a.serviceProviderStatus AS "serviceProviderStatus",
 		a.serviceProviderID AS "serviceProviderID",
-		a.masterStatus AS "masterStatus",
-		a.masterID AS "masterID",
 		a.userMoney AS "userMoney",
 		a.ableUserMoney AS "ableUserMoney",
-		a.point AS "point",
-		a.shopERPFlag AS "shopERPFlag",
-		a.fromUserID AS "fromUserID",
-		a.fromUserName AS "fromUserName",
 		a.logoffTime AS "logoffTime",
 		a.appKey AS "appKey",
 		a.appSecret AS "appSecret",
-		a.sampleFlag AS "sampleFlag",
 		a.scanFlag AS "scanFlag",
-		a.sysroleid AS "sysroleid",
-		a.gender AS "gender",
-		a.age AS "age",
-		a.salerbuyer AS "salerbuyer",
-		a.position AS "position",
-		a.skill AS "skill",
-		a.workage AS "workage",
-		a.wechat AS "wechat",
-		a.qq AS "qq",
-		a.smsFlag AS "smsFlag",
 		a.userBeans AS "userBeans",
-		a.privateShopFlag AS "privateShopFlag",
-		a.privateClubFlag AS "privateClubFlag",
-		a.isMeiDaoAuthorized AS "isMeiDaoAuthorized",
 		a.guideFlag AS "guideFlag",
 		b.nickName AS "nickName"
 	</sql>