Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml

@@ -88,8 +88,8 @@
 
     <!-- 获取AB角、资产调查、信息调查、合规调查的审批意见、审批人和时间 -->
     <select id="getAuditOpinion" parameterType="integer" resultType="com.daqing.framework.domain.guarantee.po.AuditOpinionPO">
-        SELECT a.remark AS a_audit_opinion,a.emp_id AS a_emp_id,a.update_time AS a_time,
-               b.remark AS b_audit_opinion,b.emp_id AS b_emp_id,b.update_time AS b_time,
+        SELECT a.apply_content AS a_audit_opinion,a.emp_id AS a_emp_id,a.update_time AS a_time,
+               b.apply_content AS b_audit_opinion,b.emp_id AS b_emp_id,b.update_time AS b_time,
                ass.apply_content AS asset_audit_opinion,ass.emp_id AS asset_emp_id,ass.update_time AS asset_time,
                m.remark AS message_audit_opinion,m.emp_id AS message_emp_id,m.update_time AS message_time,
                c.opinion AS regulation_audit_opinion,c.user_id AS regulation_emp_id,c.update_time AS regulation_time
@@ -98,10 +98,10 @@
         ON ass.business_id = m.business_id
         LEFT JOIN dg_compliance_investigation AS c
         ON c.business_id = ass.business_id
-        LEFT JOIN (SELECT business_id,emp_id,remark,update_time FROM dg_guarantee_assign_user
+        LEFT JOIN (SELECT business_id,emp_id,apply_content,update_time FROM dg_guarantee_assign_user
                    WHERE business_id = #{businessId} AND role_id = 59) AS a
         ON ass.business_id = a.business_id
-        LEFT JOIN (SELECT business_id,emp_id,remark,update_time FROM dg_guarantee_assign_user
+        LEFT JOIN (SELECT business_id,emp_id,apply_content,update_time FROM dg_guarantee_assign_user
                    WHERE business_id = #{businessId} AND role_id = 60) AS b
         ON ass.business_id = b.business_id
         WHERE ass.business_id = #{businessId}