Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-06 33d82cdff305ce4cb784638edc258b7bb8397353

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

@@ -57,6 +57,8 @@

   private Long shopId;
         
   private String parentIds;
			
   /**
    * 扩展属性
    */
@@ -159,6 +161,14 @@
      this.type=type;
   }

   public String getParentIds() {
      return parentIds;
   }

   public void setParentIds(String parentIds) {
      this.parentIds = parentIds;
   }

   @Override
   public String toString() {
      return "ArticleType [id=" + id + ", articleTypeName=" + articleTypeName