From 6454719d36d4e2d846e71232eca830c2b228caaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?=
 <9691125+pan-rongsheng@user.noreply.gitee.com>
Date: Fri, 24 Oct 2025 17:33:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=20=202=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/salesorder/SalesOrderController.java       |  2 --
 .../mapper/purchaseorder/PurchaseOrderMapper.xml     | 12 ++++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java
index c59bc2b..7de8564 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java
@@ -46,8 +46,6 @@ public class SalesOrderController implements BusinessControllerMarker {
 
     @Resource
     private SalesOrderService salesOrderService;
-    @Resource
-    private ContractApiImpl contractApi;
 
 
     @PostMapping("/create")
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml
index d303437..09f0787 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml
@@ -59,6 +59,10 @@
         po.UPDATER,
         po.UNT,
         po.DELETED,
+        po.PDT_GRP_CDG,
+        po.PDT_GRP_NAME,
+        po.SALE_ACS_CDG,
+        po.SALE_ACS_NAME,
         pod.ID as pod_id,
         pod.ORD_ID,
         pod.LINE_NUM,
@@ -166,10 +170,10 @@
         po.CREATOR,
         po.UPDATER,
         po.DELETED,
-        po.pdtGrpCdg,
-        po.pdtGrpName,
-        po.saleAcsCdg,
-        po.saleAcsName,
+        po.PDT_GRP_CDG,
+        po.PDT_GRP_NAME,
+        po.SALE_ACS_CDG,
+        po.SALE_ACS_NAME,
         pod.ID as pod_id,
         pod.ORD_ID,
         pod.LINE_NUM,