From b9b25acad6ee97665330a03c0210ceb1731919cf Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 26 Sep 2024 09:45:17 +0800
Subject: [PATCH] material screen

---
 bonus-common-biz/pom.xml                      |  4 ++++
 .../common/biz/constant/BmConfigItems.java    |  6 +++++
 .../bonus/common/biz/constant/Constants.java  | 22 -------------------
 .../biz}/constant/MaterialConstants.java      |  2 +-
 .../java/com/bonus/common/biz/domain/R.java   |  2 +-
 .../material/screen/domain/BmConfig.java      |  2 --
 6 files changed, 12 insertions(+), 26 deletions(-)
 create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java
 delete mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/constant/Constants.java
 rename {bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/common => bonus-common-biz/src/main/java/com/bonus/common/biz}/constant/MaterialConstants.java (83%)

diff --git a/bonus-common-biz/pom.xml b/bonus-common-biz/pom.xml
index 2bfe51cb..d658be94 100644
--- a/bonus-common-biz/pom.xml
+++ b/bonus-common-biz/pom.xml
@@ -168,6 +168,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.bonus</groupId>
+            <artifactId>bonus-common-core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java
new file mode 100644
index 00000000..77643565
--- /dev/null
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java
@@ -0,0 +1,6 @@
+package com.bonus.common.biz.constant;
+
+public class BmConfigItems {
+    public final String LEASE_AUDIT_ROLE_KEYS = "LeaseAuditRoleKeys";
+
+}
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/Constants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/Constants.java
deleted file mode 100644
index 8034da7e..00000000
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/Constants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.bonus.common.biz.constant;
-
-/**
- * 通用常量信息
- * 
- * @author bonus
- */
-public class Constants
-{
-    private Constants(){}
-
-    /**
-     * 成功标记
-     */
-    public static final Integer SUCCESS = 200;
-
-    /**
-     * 失败标记
-     */
-    public static final Integer FAIL = 500;
-
-}
diff --git a/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/common/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
similarity index 83%
rename from bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/common/constant/MaterialConstants.java
rename to bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
index 8dae6d63..27b49a68 100644
--- a/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/common/constant/MaterialConstants.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
@@ -1,4 +1,4 @@
-package com.bonus.material.common.constant;
+package com.bonus.common.biz.constant;
 
 /**
  * 仓储通用常量信息
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/R.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/R.java
index b3b1a739..21188c74 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/R.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/R.java
@@ -1,6 +1,6 @@
 package com.bonus.common.biz.domain;
 
-import com.bonus.common.biz.constant.Constants;
+import com.bonus.common.core.constant.Constants;
 
 import java.io.Serializable;
 
diff --git a/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/domain/BmConfig.java b/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/domain/BmConfig.java
index 5c30c178..4d639bc7 100644
--- a/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/domain/BmConfig.java
+++ b/bonus-modules/bonus-material-screen/src/main/java/com/bonus/material/screen/domain/BmConfig.java
@@ -1,12 +1,10 @@
 package com.bonus.material.screen.domain;
 
-import cn.hutool.core.annotation.Alias;
 import com.bonus.common.core.annotation.Excel;
 import com.bonus.common.core.annotation.Excel.ColumnType;
 import com.bonus.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;