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

无关风月

5 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

 cloud-server-activity/src/main/java/com/dsh/activity/entity/VipDetail.java

@@ -15,7 +15,7 @@
public class VipDetail {

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "用户id")