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

zj

2024-08-21 98ab2fc7accdfa1747b37de77c2fd7a0c0721f65

 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);
}