Merge branch 'feature/master' into feature/develop

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -111,7 +111,7 @@
                 (case when t1.task_type_id
                 = 1 then DATE_ADD(t1.start_month,interval 1 month) else t1.start_month end) and
                 DATE_FORMAT(#{currentMonth}, '%Y-%m-%d') <=
-                (case when t1.is_continue=1 and t1.end_month != 0 then t1.end_month when t1.end_month = 0 then DATE_FORMAT(#{currentMonth},
+                (case when t1.is_continue=1 then #{currentMonth} when t1.end_month = 0 then DATE_FORMAT(#{currentMonth},
                 '%Y-%m-%d') when t1.task_type_id = 1 then
                 DATE_ADD(t1.end_month,interval 1 month) else t1.end_month end)
             </if>