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

zyy

2025-06-25 0ba1a0b7a8528d78aa5180fc76bb4975b0da2a47

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

}