Merge branch 'gaixiankang' into 'dev'

bug(70365) -  查看车企信息-创建人员列显示成id了

See merge request !142

quality-review/src/main/resources/mapper/AutomobileEnterpriseMapper.xml

@@ -33,9 +33,25 @@
         from t_automobile_enterprise
     </sql>
 
+    <sql id="selectAutomobileEnterpriseListSQL">
+        select ae.id,
+               ae.enterprise_name,
+               ae.address,
+               ae.postcode,
+               ae.enterprise_contact,
+               ae.contact_number,
+               su.nick_name create_by,
+               ae.create_time,
+               ae.update_by,
+               ae.update_time,
+               ae.deleted
+        from t_automobile_enterprise ae
+        left join sys_user su on ae.create_by = su.user_id
+    </sql>
+
     <select id="selectAutomobileEnterpriseList" parameterType="com.ruoyi.domain.AutomobileEnterprise"
             resultMap="AutomobileEnterpriseResult">
-        <include refid="selectAutomobileEnterpriseVo"/>
+        <include refid="selectAutomobileEnterpriseListSQL"/>
         <where>
             deleted = 0
             <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name like concat('%',