From d6d25613f504d8fc4c6ffa8a1854beb4dac044d0 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 09:16:24 +0800
Subject: [PATCH] 菜单
---
src/main/java/com/zy/asrs/entity/OrderPakinLog.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
index 7123341..3938078 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -8,11 +8,11 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -20,7 +20,7 @@
import java.util.Date;
@Data
-@TableName("man_order_pakin_log")
+@TableName("man_order_log_pakin")
public class OrderPakinLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -29,7 +29,7 @@
* ID
*/
@ApiModelProperty(value = "ID")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
@@ -94,7 +94,7 @@
* 瀹㈡埛缂栧彿
*/
@ApiModelProperty(value = "瀹㈡埛缂栧彿")
- private Long cstmr;
+ private String cstmr;
/**
* 瀹㈡埛
@@ -276,10 +276,31 @@
@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;
+
+ /**
+ * 鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰曪紙涓存椂瀛楁锛屼笉鏄犲皠鍒版暟鎹簱锛�
+ */
+ @ApiModelProperty(value = "鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰�")
+ @TableField(exist = false)
+ private Boolean hasChangeLog;
+
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;
@@ -488,7 +509,7 @@
public void sync(Object source) {
- Synchro.Copy(source, this);
+ BeanUtils.copyProperties(source, this);
}
}
--
Gitblit v1.9.1