Merge remote-tracking branch 'origin/2-10' into 2-10

zj

2026-02-12 e094b18b33bde8fa171b83ea23315e8b65ea47e5

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

}