Merge branch 'score_shop' into api_score_meger

wzy

2021-11-20 56dd09a1c7405535ad5ec43a3f8b01001bb40611

 zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java

@@ -449,6 +449,19 @@
     */
    private String payMethods;

    /**
     * 是否合作项目
     */
    private Integer isCooperate;

    public Integer getIsCooperate() {
        return isCooperate;
    }

    public void setIsCooperate(Integer isCooperate) {
        this.isCooperate = isCooperate;
    }

    public String getAchieveRuleName() {
        return achieveRuleName;
    }