From 2a8241df4493a36b046855f2283b1c3da9e6bfbe Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index fc2182a..ed54c71 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -23,6 +23,12 @@
public static final String ACCESS_KEY = "ACCESS_KEY";
public static final String ENDPOINT = "ENDPOINT";
public static final String RESOURCE_PATH = "RESOURCE_PATH";
+ public static final String WEB_PARAM = "WEB_PARAM";
+ public static final String MAIN_COLOR = "MAIN_COLOR";
+ public static final String BG_IMG = "BG_IMG";
+ public static final String TOP_IMG = "TOP_IMG";
+ public static final String PK_IMG = "PK_IMG";
+ public static final String RANGE_SIZE = "RANGE_SIZE";
public static final String SYSTEM ="SYSTEM";
@@ -38,6 +44,13 @@
public static final String CATEGORY_IMG = "CATEGORY_IMG";
public static final String GOODS_IMG ="GOODS_IMG" ;
public static final String GOODS_PRICE_RATE = "GOODS_PRICE_RATE";
+ public static final String COMPANY_MANAGE_ROLE = "COMPANY_MANAGE_ROLE";
+
+
+ public static final String DEFAULT_MANAGE_ROLE = "DEFAULT_MANAGE_ROLE";
+ public static final String DEFAULT_PASSWORD = "DEFAULT_PASSWORD";
+ public static final String BRAND_IMG = "BRAND_IMG";
+ public static final String PLATFORM = "PLATFORM";
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -651,6 +664,40 @@
}
}
+
+ public enum goodsType {
+
+ /** 鐢ㄦ埛鍚敤绂佺敤鏋氫妇鍊�*/
+ CREATE(0,"鑷缓"),
+ PULL(1,"鎷夊彇");
+
+ private Integer value;
+ private String des;
+
+
+ goodsType(Integer value, String des) {
+ this.value = value;
+ this.des = des;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+
+ public void setValue(Integer value) {
+ this.value = value;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+ }
+
+
public enum CompanyType{
BUSINESS_COMPANYTYPE(0,"浼佷笟"),
--
Gitblit v1.9.3