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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopAdvertis.java

@@ -63,12 +63,25 @@
    */
   private String linkUrl;

   /**连接的页面id */
   private  Long  pageId;

   /**
    * 所属分类
    */
   @Extend
   private String adtName;

   private Long companyId;

   public Long getPageId() {
      return pageId;
   }

   public void setPageId(Long pageId) {
      this.pageId = pageId;
   }

   public Long getCompanyId() {
      return companyId;
   }