Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

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