Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

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