Merge remote-tracking branch 'origin/ysz' into ysz

zj

2024-09-04 6404cb07e5281cfd901267c4fd560ba89bd5e2fd

 src/main/java/com/nq/dao/StockMapper.java

@@ -54,4 +54,7 @@


  List findStockByType(@Param("orderBy") String orderBy, @Param("stockType") String stockType,@Param("keyWords") String keyWords);


  List findStockTypeDz(@Param("orderBy") String orderBy, @Param("stockType") String stockType,@Param("keyWords") String keyWords);
}