Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

wzy

2021-11-20 2a7a159b136805612e241e4e8e24affedfc23cc2

 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 固定值
     */