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

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

@@ -78,6 +78,7 @@
         limit #{pageNo}, #{pageSize}
     </select>
 
+
     <select id="count" resultType="java.lang.Integer">
         SELECT count(*)
         FROM user_points up