diff --git a/pom.xml b/pom.xml
index a2757fab..2f6fbb30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,8 +179,8 @@
172.16.46.63:30848
dev
DEFAULT_GROUP
-
-
+ nacos
+ P@ssword25
1.0.0
@@ -192,8 +192,8 @@
172.16.46.63:30848
prod
DEFAULT_GROUP
-
-
+ nacos
+ P@ssword25
1.0.0
@@ -205,8 +205,8 @@
172.16.46.63:30848
local
DEFAULT_GROUP
-
-
+ nacos
+ P@ssword25
1.0.0
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
index c4d9fad4..76c193f2 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
@@ -231,6 +231,7 @@ public class OrderApiImpl implements OrderApi {
ordDtlDTO.setIsEnable(s.getIsEnable());
ordDtlDTO.setTaxNum(s.getTaxAcctasscat());
ordDtlDTO.setTrfQty(s.getTrfQty());
+ ordDtlDTO.setRmk(s.getRemark());
}
return ordDtlDTO;
}
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java
index 8533e852..31b7f291 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java
@@ -1,7 +1,5 @@
package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
-import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SaleOrderDetailsRespVO;
-import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java
index 98f89b24..e7950fee 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java
@@ -119,4 +119,6 @@ public class SalesOrderDetailRespVO {
@Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED)
private String unt;
+ @Schema(description = "备注")
+ private String remark;
}
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java
index 499eadcd..e5cb8d65 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java
@@ -99,4 +99,7 @@ public class SalesOrderDetailSaveReqVO {
@Schema(description = "税率")
private String taxRte;
+ @Schema(description = "备注")
+ private String remark;
+
}
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java
index 31642439..05c2753c 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java
@@ -157,4 +157,10 @@ public class SalesOrderDetailDO extends BusinessBaseDO {
@TableField("TRF_QTY")
private BigDecimal trfQty;
+
+ /**
+ * 备注
+ */
+ @TableField("RMK")
+ private String remark;
}