Merge remote-tracking branch 'origin/master'

liyj

2024-09-10 abb0d631ffed8b67b0a78205ba127b46a4cb546b

 dyh-service/dyh-base/src/main/resources/template/dao.mapperXml.ftl

@@ -61,7 +61,7 @@
                </#if>
                <#if (col.name == "delete_status")>
                <if test="terms.${col.fieldName} = null and terms.${col.fieldName} =''">
                    and delete_status = '1'
                    and delete_status = 0
                </if>
                <if test="terms.${col.fieldName} != null and terms.${col.fieldName} !=''">
                    and ${col.name} = <#noparse>#{</#noparse>terms.${col.fieldName}<#noparse>}</#noparse>