Merge remote-tracking branch 'origin/master'

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -658,6 +658,7 @@
             INNER JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID )
         WHERE
             r.CUSTOMER_ID = #{customerId}
+            AND r.DEL_FLAG = '0'
             AND r.STATUS = 'finished'
             <foreach item="serverId" collection="serverIds" open="AND (" separator="or" close=")" index="">
                  s.SERVER_ID = #{serverId}