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

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyPointTaskResultDTO.java

@@ -74,7 +74,7 @@ public class MyPointTaskResultDTO implements Serializable {
     private Integer finishedCount;
 
     /**
-     * 上限次数,-1代表没有上限
+     * 上限次数,0代表没有上限次数
      */
     private Integer upLimitCount;
     /**

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -109,7 +109,7 @@
                     AND u.CUSTOMER_ID = #{customerId}
                     AND DATE_FORMAT( u.CREATED_TIME, '%Y%m%d' ) =#{dateId}
                 ) AS finishedCount,
-                (case when pr.UP_LIMIT='0' then '-1'
+                (case when pr.UP_LIMIT='0' then '0'
                     else CEIL(pr.UP_LIMIT/pr.point)
                     end
                 )as upLimitCount,