Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

# Conflicts: # openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/controller/PurchaseInventoryController.java
2025-02-20 19:25:58 +08:00
parent 62c2a8ac92 efc5c6ecd6
commit eaa01f2fca
16 changed files with 496 additions and 55 deletions
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
@@ -19,4 +19,6 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
     * @return 供应申请列表
     */
    Page<SupplyRequest> getPage(SupplyRequest supplyRequest, Integer pageNo, Integer pageSize);
+
+
 }