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 3e84e5de..7b7fd728 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 ce218f3f..68b0eb5d 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; }