From e1cc4a8ac8250d8f76d4d85f49b2b00a4047f0c9 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 11 Sep 2021 17:40:53 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/hiveErp/pojo/AchieveRuleItem.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/pojo/AchieveRuleItem.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/pojo/AchieveRuleItem.java index 6b67b4e..8eec4db 100644 --- a/zq-erp/src/main/java/com/matrix/system/hiveErp/pojo/AchieveRuleItem.java +++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/pojo/AchieveRuleItem.java @@ -16,7 +16,7 @@ /** * 类型,2赠送消耗 */ - public static final int ACHIEVE_TYPE_CONSUME=2; + public static final int ACHIEVE_TYPE_ZS =2; /** * 计算类型 1 固定值 */ -- Gitblit v1.9.1