Merge branch 'api' into score_shop

jyy

2021-03-10 df6a117d2923400fef1ed14cd60d14f56f4a6eec

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

@@ -261,6 +261,16 @@

   private String goodsName;

   private String type;

   public String getType() {
      return type;
   }

   public void setType(String type) {
      this.type = type;
   }

   public String getGoodsNo() {
      return goodsNo;
   }