合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/java/com/zy/common/model/QueryStockPreDo.java

@@ -14,4 +14,6 @@

    private Double count;

    private String orderBy;

}