From 59251b6445daef3729a205fc7054fcbdc55b060a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 11:16:05 +0800
Subject: [PATCH] #修复  1. 收货单新增物料时分组查询不生效  2. 综合订单分页数调整  3. 物料列表报错修复

---
 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: 姝e父  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