分页查询码活动未关联的码包列表(新增修改页面) sql异常解决

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

@@ -69,7 +69,7 @@
         left join qr_package qp on baqpm.qr_package_id = qp.id
         left join base_material bm on qp.material_id = bm.id
         left join base_sku bs on bm.sku_id = bs.id
-        left join base_brand bb on bs.brand_code = bb.brand_code
+        left join base_brand bb on bs.sub_brand_code = bb.brand_code
         where ba.id = #{id}
     </select>
 

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

@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <!--通过品牌code查询关联码包列表-->
-    <select id="listPackageByBrandCode" resultType="com.abi.qms.platform.dao.vo.result.listPackageByBrandCode">
+    <select id="listPackageByBrandCode" resultType="com.abi.qms.platform.dao.vo.result.PackageActiveSearchVO">
         select
         qp.id as packageId,
         qp.qr_type,