Merge remote-tracking branch 'origin/1.11rg' into 1.11rg

zyy

2026-01-19 b864ea85f84cee2df8616f4eb5757f5f3f1a5c43

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

}