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

jinpengyong

2023-09-26 b9086588c215b7493682d65d49ed1070d88c3058

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

@@ -27,7 +27,7 @@
        SELECT
        <include refid="AllocationExtension_Column_List"/>
        FROM allocation_extension allocationextension
        where allocationextension.id = #{id}
        where allocationextension.id = #{id} and allocationextension.is_del = 0
    </select>