From e156d92645e4c5589283a5ad5d7d932f81276a77 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 22 Mar 2024 10:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/system/api/domain/SysUser.java       | 4 ++++
 .../java/com/op/system/api/domain/sap/SapBaseProduct.java     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
index 3e84e5dee..7b7fd7286 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysUser.java
@@ -3,6 +3,10 @@ package com.op.system.api.domain;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+import javax.validation.groups.ConvertGroup;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.op.common.core.annotation.Excel;
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java
index ce218f3f1..68b0eb5db 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapBaseProduct.java
@@ -166,8 +166,11 @@ public class SapBaseProduct extends BaseEntity {
 	@Excel(name = "补料比例")
 	private String appendPercent;
 
+	/** 基本计量单位*/
+	@Excel(name = "基本计量单位")
 	private String meins;
 
+
 	public String getMeins() {
 		return meins;
 	}