From 03cf062f4e435ff6d9c2e75d4341ae0eca97898c Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 30 Mar 2022 17:32:38 +0800 Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' of http://120.27.238.55:7000/r/beauty-erp into feature/订单服务单代码改造 --- 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