Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -544,7 +544,7 @@
                 concat('%',#{param.allocation},'%')
             </if>
         </where>
-        group by ldsa.warehouse_entry_time desc
+        group by ldsa.id order by ldsa.warehouse_entry_time desc
     </select>
     <select id="selectOneByWrap" resultType="com.logpm.distribution.vo.app.queryOrderVO">
         SELECT ldsa.* FROM logpm_distribution_parcel_list ldpl join logpm_distribution_stock_article ldsa on