From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
index 18f2f6e..0d74dbd 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -11,8 +12,13 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
import java.io.Serializable;
+@Data
+@NoArgsConstructor
@TableName("sys_flow_status")
public class FlowStatus implements Serializable {
@@ -52,16 +58,16 @@
@ApiModelProperty(value= "")
private String str3;
- public FlowStatus() {}
+ @TableField("weight_num")
+ private Integer weightNum;
- public FlowStatus(Integer type,String name,String memo,String str1,String str2,String str3) {
- this.type = type;
- this.name = name;
- this.memo = memo;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- }
+ /**
+ * 0锛氬父瑙勯」鐩�
+ * 1锛氶泦鎴愰」鐩�
+ */
+ @TableField("is_asrs")
+ private Integer isAsrs;
+
// FlowStatus flowStatus = new FlowStatus(
// null, // 鑺傜偣绫诲瀷
@@ -72,6 +78,13 @@
// null //
// );
+ public String getIsAsrs$(){
+ if (this.isAsrs == 0) {
+ return "甯歌椤圭洰";
+ }else {
+ return "闆嗘垚椤圭洰";
+ }
+ }
public Integer getId() {
return id;
}
--
Gitblit v1.9.1