From 46b422214d5d422be5dfa0df57560cda678058c9 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 24 十二月 2025 08:30:38 +0800
Subject: [PATCH] 月结功能-主体

---
 src/main/java/com/zy/asrs/entity/OrderPakinLog.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
index a61321b..13b3341 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -276,10 +276,24 @@
     @TableField("pakin_pakout_status")
     private Integer pakinPakoutStatus;
 
+    /**
+     * 鏈堢粨ID
+     */
+    @ApiModelProperty(value = "鏈堢粨ID")
+    @TableField("monthly_settle_id")
+    private Long monthlySettleId;
+
+    /**
+     * 鏈堢粨缂栧彿
+     */
+    @ApiModelProperty(value = "鏈堢粨缂栧彿")
+    @TableField("monthly_settle_no")
+    private String monthlySettleNo;
+
     public OrderPakinLog() {
     }
 
-    public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;

--
Gitblit v1.9.1