Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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