From cd56d5963f7234a03fec057d807ad1607be17c23 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 16:47:17 +0800
Subject: [PATCH] conflect
---
gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java b/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java
index 30d3f14..b236390 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/constant/Constants.java
@@ -193,6 +193,7 @@
public static final String SYS_MODUL_NAME="消息模块";
public static final String PAY_MODUL_NAME="支付模块";
public static final String ROLE_MODUL_NAME="权限模块";
+ public static final String SCORESHOP_MODUL_NAME="积分商城模块";
//最小正常文件大小
@@ -217,5 +218,8 @@
//禁用
public static final String FORBIDDEN="S0";
+ public static final String ADDRESS_TYPE_SHOP = "商铺";
+ public static final String ADDRESS_TYPE_HOME = "住宅";
+
}
--
Gitblit v1.9.1