解决 码活动分页查询sql异常

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseActiveMapper.xml

@@ -30,11 +30,11 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, active_code, active_name, active_name, audit_status, apply_time, apply_user_id, apply_user_name, audit_user_id, audit_user_name, begin_time, end_time, brand_code, sub_brand_code, active_url, create_time, create_by, update_time, update_by, is_delete, valid, is_modify_apply
+        id, active_code, active_name, active_type, audit_status, apply_time, apply_user_id, apply_user_name, audit_user_id, audit_user_name, begin_time, end_time, brand_code, sub_brand_code, active_url, create_time, create_by, update_time, update_by, is_delete, valid, is_modify_apply
     </sql>
 
     <select id="listActivePage" resultType="com.abi.qms.platform.dao.vo.result.ListActiveVO">
-        select active.id, active.active_name, active.active_name, active.audit_status, active.apply_time, active.apply_user_name, active.begin_time, active.end_time, active.active_url, active.valid, active.is_modify_apply, apply.audit_status as apply_audit_status
+        select active.id, active.active_name, active.active_type, active.audit_status, active.apply_time, active.apply_user_name, active.begin_time, active.end_time, active.active_url, active.valid, active.is_modify_apply, apply.audit_status as apply_audit_status
         from base_active active
         left join base_active_modify_apply apply on active.id = apply.active_id and apply.is_delete = 0
         <where>