Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-29 835f6562bd7a83fd156c0bc8b9e48b3e6fe3f5ee

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