Merge remote-tracking branch 'origin/6-29' into 6-29

peternameyakj

2024-07-14 85037c73f8b16f4258a2af354cd162247700ffde

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

@@ -59,6 +59,6 @@
  List findStockByType(@Param("orderBy") String orderBy, @Param("stockType") String stockType,@Param("keyWords") String keyWords);


  List<StockDz> findStockTypeDz(@Param("orderBy") String orderBy, @Param("keyWords") String keyWords);
  List<StockDz> findStockTypeDz(@Param("orderBy") String orderBy, @Param("keyWords") String keyWords , @Param("formatDate") String formatDate);

}