From d524c2c3f60032916218a638ee5fa610cd2a330c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:37 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

---
 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java b/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
index 37951a2..41d5d7c 100644
--- a/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
+++ b/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
@@ -403,10 +403,6 @@
 	 * 商城商品-充值卡
 	 */
 	String SHOPPING_GOODS_TYPE_CZK = "充值卡";
-	/**
-	 * 商城商品-综合卡
-	 */
-	String SHOPPING_GOODS_TYPE_ZHK = "综合卡";
 
 
 

--
Gitblit v1.9.1