'合并'

src/main/java/com/futu/course/cupons/domain/Coupon.java

@@ -60,7 +60,7 @@ public class Coupon implements Serializable {
     /**
      * NULL表示平台券
      */
-    private Long shopId;
+    private String shopId;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;