Merge branch 'develop'

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -669,7 +669,7 @@
     <select id="selectUnionIdByPhone" resultType="java.lang.String">
         select union_id
         from user_account
-        where phone_num = #{phone}
+        where phone_num = #{phone} and disable = 0
         limit 1
     </select>