From 0b24c883b412fd1f096c5fe3fb607a3d9b13c97e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 11 九月 2023 09:46:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 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 412fa7e..fc2182a 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
@@ -35,6 +35,10 @@
public static final String HOME_IMAGE="HOME_IMAGE";//H5 棣栭〉鍥�
public static final String PROJECTS = "PROJECTS";
+ 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";
+
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
*/
@@ -438,14 +442,7 @@
SYSTEM(0, "绯荤粺鐢ㄦ埛", "绠＄悊鍛�",Arrays.asList(0,1,2,3,4,5,6,7,8,9,10,11)),
COMPANY(1, "浼佷笟鐢ㄦ埛", "浼佷笟",Arrays.asList(-1)),
- SO_ADMIN(2, "鏈嶅姟鏈烘瀯绠＄悊鍛�", "鏈嶅姟鏈烘瀯",Arrays.asList(-1)),
- SO_CHILD(3, "鏈嶅姟鏈烘瀯瀛愯处鍙�", "鏈嶅姟鏈烘瀯",Arrays.asList(-1)),
- SD_ADMIN(4, "缁煎悎鏈嶅姟鍗曚綅绠＄悊鍛�", "缁煎悎鏈嶅姟鍗曚綅",Arrays.asList(0,1,2,3,4,5,6,7,8,9,10,11)),
- SD_CHILD(5, "缁煎悎鏈嶅姟鍗曚綅瀛愯处鍙�", "缁煎悎鏈嶅姟鍗曚綅",Arrays.asList(0,1,2,3,4,5,6,7,8,9,10,11)),
- EXPERT(6, "涓撳", "涓撳", Arrays.asList(-1)),
- AREA(7, "鍘垮尯鐢ㄦ埛", "鍘垮尯",Arrays.asList(0,1,2,3,4,5,6,7,8,9)),
- SJ(8, "甯傚眬鐢ㄦ埛", "甯傚眬",Arrays.asList(0,1,2,3,4,5,6,7,8,9,10,11)),
- SJ_CHILD(9, "甯傚眬瀛愯处鍙�", "甯傚眬瀛愯处鍙�",Arrays.asList(0,1,2,3,4,5,6,7,8,9,10,11)),
+ ZHUBO(2, "涓绘挱", "涓绘挱",Arrays.asList(-1)),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -514,29 +511,7 @@
return noteinfo;
}
- /**
- * 涓嶉渶瑕佸鎵逛慨鏀逛俊鎭鑹�
- * @return
- */
- public static List<Integer> getNoCheckUserChange(){
- return Arrays.asList(SO_ADMIN.key, AREA.key, SJ.key, EXPERT.key, SD_ADMIN.key,SYSTEM.key);
- }
- /**
- * 鑾峰彇瀛愯处鍙风被鍨�
- * @return
- */
- public static List<Integer> getSonUserType(){
- return Arrays.asList(SO_CHILD.key, SD_CHILD.key);
- }
-
- /**
- * 鑾峰彇鍏宠仈浼佷笟鐨勭敤鎴风被鍨�
- * @return
- */
- public static List<Integer> getHasCompanyType(){
- return Arrays.asList(COMPANY.key, SO_ADMIN.key, SD_ADMIN.key);
- }
}
--
Gitblit v1.9.3