From 401e85bb3749bb9107f65ddaa15868a0a9ba852e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 14:18:46 +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/manager/entity/BatchRegular.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
index 399c785..558d326 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BatchRegular.java
@@ -50,7 +50,7 @@
* 灞炴�ф牸寮�
*/
@ApiModelProperty(value= "灞炴�ф牸寮�")
- private String property;
+ private String attrs;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -105,10 +105,10 @@
public BatchRegular() {}
- public BatchRegular(String name,String code,String property,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public BatchRegular(String name,String code,String attrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
- this.property = property;
+ this.attrs = attrs;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
--
Gitblit v1.9.1