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

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

@@ -192,9 +192,7 @@
             CONVERT ( m.CATEGORY_CODE, UNSIGNED )) AS maxFirstCategoryCode
         FROM
             ic_resi_demand_dict m
-        WHERE
+        WHERE m.CUSTOMER_ID = #{customerId}
-            m.DEL_FLAG = '0'
-            AND m.CUSTOMER_ID = #{customerId}
             AND m.`LEVEL` = #{level}
             and m.parent_code=#{parentCode}
     </select>