Merge remote-tracking branch 'origin/master'

wangwh

2024-09-13 61cb0460b5d5c8a5a2bae04ed67661599a1aaebf

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml

@@ -34,7 +34,7 @@
            <result property="auditTime" column="audit_time"/>
            <result property="auditResult" column="audit_result"/>
            <result property="auditResultName" column="audit_result_name"/>
            <result property="audit_content" column="audit__content"/>
            <result property="auditContent" column="audit_content"/>
            <result property="deleteStatus" column="delete_status"/>
            <result property="custId" column="cust_id"/>
            <result property="createTime" column="create_time"/>
@@ -67,7 +67,7 @@
        audit_time,
        audit_result,
        audit_result_name,
        audit__content,
        audit_content,
        delete_status,
        cust_id,
        create_time,
@@ -97,7 +97,7 @@
            <if test="entity.auditTime != null">audit_time = #{entity.auditTime},</if>
            <if test="entity.auditResult != null">audit_result = #{entity.auditResult},</if>
            <if test="entity.auditResultName != null">audit_result_name = #{entity.auditResultName},</if>
            <if test="entity.audit_content != null">audit__content = #{entity.audit_content},</if>
            <if test="entity.auditContent != null">audit_content = #{entity.auditContent},</if>
            <if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
            <if test="entity.custId != null">cust_id = #{entity.custId},</if>
            <if test="entity.createTime != null">create_time = #{entity.createTime},</if>
@@ -176,8 +176,8 @@
                <if test="terms.auditResultName != null and terms.auditResultName !=''">
                    and audit_result_name = #{terms.auditResultName}
                </if>
                <if test="terms.audit_content != null and terms.audit_content !=''">
                    and audit__content = #{terms.audit_content}
                <if test="terms.auditContent != null and terms.auditContent !=''">
                    and audit_content = #{terms.auditContent}
                </if>
                <if test="terms.deleteStatus = null and terms.deleteStatus =''">
                    and delete_status = 0