Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-28 5eb88939c094fac1f5dc9201b5af6da4165cc185

 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml

@@ -49,7 +49,7 @@
                and t1.pollute_type = #{allocation.polluteType}
            </if>
            <if test="allocation.state != null and allocation.state != 0">
                and t1.state = #{allocation.state}
                and allocationextension.state = #{allocation.state}
            </if>
            <if test="allocation.investigationType != null and allocation.investigationType != 0">
                and t1.investigation_type = #{allocation.investigationType}