Merge branch 'feature-offline-activity' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkDTO.java

@@ -16,7 +16,7 @@ public class HmLinkDTO implements Serializable {
 
     private static final long serialVersionUID = 1967119533845800L;
 
-    private String linkId;
+    private Long linkId;
     private String linkCode;
     /**1专用链接 2通用链接*/
     private Integer linkType;
@@ -78,11 +78,11 @@ public class HmLinkDTO implements Serializable {
         this.storeList = storeList;
     }
 
-    public void setLinkId(String linkId) {
+    public void setLinkId(Long linkId) {
         this.linkId = linkId;
     }
 
-    public String getLinkId() {
+    public Long getLinkId() {
         return linkId;
     }