Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -880,6 +880,9 @@
             <if test="capacityTypeId!=null and capacityTypeId!=''">
                 AND RCT.CAPACITY_TYPE_ID =  #{capacityTypeId}
             </if>
+            <if test="isPCapacityTypeId!=null and isPCapacityTypeId!=''">
+                AND RCT.P_CAPACITY_TYPE_ID is null
+            </if>
             <if test="capacityTypeNameList != null and capacityTypeNameList.size > 0">
                 and
                 RCT.CAPACITY_TYPE_NAME in