Merge branch 'feature/bug-20250707' into test

nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml

@@ -68,7 +68,7 @@
     </select>
 
     <select id="getSimpleListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSimpleVO">
-        select distinct batch_number,psi.name
+        select distinct batch_number,psi.name,ps.sort
         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}