Merge branch 'feature/bug-20250707' into test

This commit is contained in:
曹鹏飞 2025-07-14 10:39:23 +08:00
commit 1b07a13273
2 changed files with 2 additions and 1 deletions

View File

@ -68,7 +68,7 @@
</select>
<select id="getSimpleListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSimpleVO">
select distinct batch_number,psi.name,sort
select distinct batch_number,psi.name
from product_series ps
inner join product_series_info psi on ps.id=psi.series_id
where state=1 and enable=1 and module_id=#{moduleId} and psi.language_code=#{language}

View File

@ -91,6 +91,7 @@
and pt.enable = 1
and pt.series_number = #{batchNumber}
AND pti.language_code = #{language}
order by pt.sort
</select>
<select id="getListForSort" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductTypeSearchVO">