Merge branch 'developer' into alpha

姜友瑶

2022-05-17 81e00cd2e26e387d8ab2077ccd982072d6eb865b

 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;
    }