Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml

@@ -10,8 +10,8 @@
     <select id="selectBasicdataPricePage" resultType="com.logpm.basicdata.vo.BasicdataPricePageVO">
         select t.id,
         cli.client_name,
-        t.brand_id,
+        lbsb.brand_id,
-        t.client_id,
+        lbsb.client_id,
         t.template_id,
         ldb.brand_name,
         lbpt.service_type,
@@ -27,7 +27,7 @@
         left join logpm_basicdata_client cli on cli.id = lbsb.client_id
         left join logpm_basicdata_price t on lbsb.client_id = t.client_id
         and lbsb.brand_id = t.brand_id and t.effective_time  <![CDATA[ <= ]]>  now() and t.expiry_time >= now()
-        left join logpm_basicdata_brand ldb on ldb.id = t.brand_id
+        left join logpm_basicdata_brand ldb on ldb.id = lbsb.brand_id
         left join logpm_basicdata_price_template lbpt on t.template_id = lbpt.id
         where lbsb.is_deleted = 0
         <if test="basicdataPrice.clientName != null and basicdataPrice.clientName != ''">