From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 17 十一月 2023 16:45:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- mes-plan/src/main/java/com/chinaztt/mes/plan/entity/CustomerOrder.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/entity/CustomerOrder.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/entity/CustomerOrder.java index d28921e..bb82473 100644 --- a/mes-plan/src/main/java/com/chinaztt/mes/plan/entity/CustomerOrder.java +++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/entity/CustomerOrder.java @@ -17,9 +17,11 @@ package com.chinaztt.mes.plan.entity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.sun.org.apache.xpath.internal.operations.Bool; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -106,10 +108,13 @@ */ @ApiModelProperty(value = "闆朵欢鍙凤細鐢ㄤ簬鐢熶骇鐨勯浂浠跺彿") private String partNo; + + @ApiModelProperty(value = "闆朵欢缂栧彿锛氱敤浜庣敓浜х殑闆朵欢鍙�") + private String partId; /** - * 搴撳瓨鏁伴噺 + * 鏁伴噺 */ - @ApiModelProperty(value = "搴撳瓨鏁伴噺") + @ApiModelProperty(value = "鏁伴噺") private BigDecimal buyQtyDue; /** * OTC閿�鍞暟閲� @@ -363,9 +368,9 @@ @ApiModelProperty(value = "闆朵欢鏄惁鎺ㄩ��") private Boolean otcPartSync; /** - * 浜у搧鍒嗙被 + * 浜у搧绫诲瀷 */ - @ApiModelProperty(value = "浜у搧鍒嗙被") + @ApiModelProperty(value = "浜у搧绫诲瀷") private String productType; /** * 浜у搧鍒嗙粍 @@ -407,5 +412,11 @@ */ @ApiModelProperty(value = "閫�鍥炲師鍥�") private String returnReason; + + /** + * 椤圭洰鍚嶇О + */ + @ApiModelProperty(value="椤圭洰鍚嶇О") + private String entityName; } -- Gitblit v1.9.3