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

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

@@ -424,7 +424,7 @@
 				tipStatus = #{tipStatus},
 			</if>
         </set>
-        WHERE userID != #{companyUserID}
+        WHERE userID = #{companyUserID}
     </update>
 
     <update id="updateUserStatus">