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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 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() {