Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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

@@ -96,14 +96,14 @@
    */
   private Integer commentNum;

   private Long shopId;
   private Long companyId;

   public Long getShopId() {
      return shopId;
   public Long getCompanyId() {
      return companyId;
   }

   public void setShopId(Long shopId) {
      this.shopId = shopId;
   public void setCompanyId(Long companyId) {
      this.companyId = companyId;
   }

   public Integer getCommentNum() {