From d692259553b83ed00ada0ba2792ae91704a4def2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 13:52:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index 7f2920c..12f7d3f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +24,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("sys_serial_rule")
public class SerialRule implements Serializable {
@@ -68,7 +71,7 @@
* 褰撳墠鍊�
*/
@ApiModelProperty(value= "褰撳墠鍊�")
- private String currValue;
+ private Integer currValue;
/**
* 鏈�杩戠敓鎴愮紪鐮�
@@ -81,6 +84,9 @@
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
+
+ @ApiModelProperty(value = "娴佹按鍙锋渶澶ч暱搴�")
+ private Integer maxLen;
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
@@ -129,7 +135,7 @@
public SerialRule() {}
- public SerialRule(String code,String name,String delimit,String reset,String resetDep,String currValue,String lastCode,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public SerialRule(String code,String name,String delimit,String reset,String resetDep,Integer currValue,String lastCode,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
this.name = name;
this.delimit = delimit;
--
Gitblit v1.9.1