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

.gitignore

@@ -1,3 +1,4 @@
+/target/
 /target/**/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
@@ -17,4 +18,3 @@ libraries
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.miniprogram.dao.CmMiniProgramUserDao">
-    
+
 	<sql id="cmMiniProgramUserColumns">
 		a.userID AS "userID",
 		a.account AS "account",
@@ -79,20 +79,20 @@
 		a.miniProgramOpenId AS "miniProgramOpenId",
 		a.miniProgramId AS "miniProgramId"
 	</sql>
-	
+
 	<sql id="cmMiniProgramUserJoins">
 	</sql>
-    
+
 	<select id="get" resultType="CmMiniProgramUser">
-		SELECT 
+		SELECT
 			<include refid="cmMiniProgramUserColumns"/>
 		FROM user a
 		<include refid="cmMiniProgramUserJoins"/>
 		WHERE a.userID = #{userID}
 	</select>
-	
+
 	<select id="findList" resultType="CmMiniProgramUser">
-		SELECT 
+		SELECT
 			<include refid="cmMiniProgramUserColumns"/>
 		,cb.nickName AS 'weixinNick'
 		FROM user a
@@ -112,15 +112,15 @@
 		</where>
 		ORDER BY a.registerTime desc
 	</select>
-	
+
 	<select id="findAllList" resultType="CmMiniProgramUser">
-		SELECT 
+		SELECT
 			<include refid="cmMiniProgramUserColumns"/>
 		FROM user a
 		<include refid="cmMiniProgramUserJoins"/>
 		<where>
-			
-		</where>		
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -129,7 +129,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="CmMiniProgramUser"  keyProperty="userID" useGeneratedKeys="true">
 		INSERT INTO user(
 			account,
@@ -200,7 +200,6 @@
 			privateShopFlag,
 			privateClubFlag,
 			isMeiDaoAuthorized,
-			guideFlag,
 			loginFailTime,
 			tipStatus,
 			applyTime,
@@ -275,7 +274,6 @@
 			#{privateShopFlag},
 			#{privateClubFlag},
 			#{isMeiDaoAuthorized},
-			#{guideFlag},
 			#{loginFailTime},
 			#{tipStatus},
 			#{applyTime},
@@ -283,9 +281,9 @@
 			#{miniProgramId}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE user SET 	
+		UPDATE user SET
 			account = #{account},
 			mobile = #{mobile},
 			email = #{email},
@@ -362,10 +360,10 @@
 			miniProgramId = #{miniProgramId}
 		WHERE userID = #{userID}
 	</update>
-	
+
 	<delete id="delete">
 		DELETE FROM user
 		WHERE id = #{id}
 	</delete>
-	
-</mapper>
+
+</mapper>

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

@@ -223,7 +223,6 @@
 
     <insert id="insert" parameterType="CmUser" keyProperty="userID" useGeneratedKeys="true">
 		INSERT INTO user(
-			userOrganizeID,
 			account,
 		  	realName,
 		  	userIdentity,
@@ -294,10 +293,8 @@
 			userBeans,
 			privateShopFlag,
 			privateClubFlag,
-			isMeiDaoAuthorized,
-			guideFlag
+			isMeiDaoAuthorized
 		) VALUES (
-			#{userOrganizeID},
 			#{account},
 		  	#{realName},
 		  	#{userIdentity},
@@ -368,8 +365,7 @@
 			#{userBeans},
 			#{privateShopFlag},
 			#{privateClubFlag},
-			#{isMeiDaoAuthorized},
-			#{guideFlag}
+			#{isMeiDaoAuthorized}
 		)
 	</insert>
 

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -64,6 +64,9 @@
                                                 }
                                                 return;
                                             }, {buttons: {'确定审核通过': true, '取消': false}});
+                                        } else {
+                                            loading('正在提交，请稍等...');
+                                            form.submit();
                                         }
                                     }else {
                                         loading('正在提交，请稍等...');