From 61cb0460b5d5c8a5a2bae04ed67661599a1aaebf Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Fri, 13 Sep 2024 10:34:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml index 89a37e1..c375f78 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseAssistApplyMapper.xml @@ -29,7 +29,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"/> @@ -57,7 +57,7 @@ audit_time, audit_result, audit_result_name, - audit__content, + audit_content, delete_status, cust_id, create_time, @@ -82,7 +82,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> @@ -146,8 +146,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 -- Gitblit v1.8.0