Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java
#	zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java

@@ -7,6 +7,7 @@ import com.zt.plat.module.contractorder.api.dto.PrchOrdDtlDTO;
 import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderDetailsRespVO;
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderWithDetailsVO;
+import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 import com.zt.plat.module.contractorder.service.contract.ContractService;
 import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService;
 import jakarta.annotation.Resource;
@@ -30,7 +31,7 @@ public class ContractApiImpl implements ContractApi {
     private PurchaseOrderService purchaseOrderService;
 
     @Override
-    public List<ContractFormulaRespDTO> getFormulas(String contractPaperNumber) {
+    public ContractRespDTO getContractByPaperNumber(String contractPaperNumber) {
         return contractService.getFormulasByPaperNumber(contractPaperNumber);
     }
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -1,7 +1,7 @@
 package com.zt.plat.module.contractorder.service.contract;
 
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.module.contractorder.api.dto.ContractFormulaRespDTO;
+import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import jakarta.validation.Valid;
@@ -88,12 +88,12 @@ public interface ContractService {
     List<FormulaRespVO> getFormulas(FormulasQueryReqVO queryReqVO);
 
     /**
-     * 通过合同编号获取对应的结算条款数据
+     * 通过合同编号获取对应的合同信息
      *
      * @param contractPaperNumber 合同编号
      * @return 结算条款数据
      */
-    List<ContractFormulaRespDTO> getFormulasByPaperNumber(String contractPaperNumber);
+    ContractRespDTO getFormulasByPaperNumber(String contractPaperNumber);
 
     /**
      * 提交ERP