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

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,
@@ -297,7 +296,6 @@
 			isMeiDaoAuthorized,
 			guideFlag
 		) VALUES (
-			#{userOrganizeID},
 			#{account},
 		  	#{realName},
 		  	#{userIdentity},

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

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