From 81507d0c196821cd333f08c75f3978e726df24cd Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:38:10 +0800
Subject: [PATCH] Merge branch 'developer'
---
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