Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 0b96b79847bd5269e7bd223f338a6c8bd692a97b

 cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java

@@ -164,7 +164,7 @@
     * 添加时间
     */
    @TableField("insertTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date insertTime;
    @TableField("nextName")
    @ApiModelProperty("场地名称")
@@ -185,4 +185,6 @@
    private List<Integer> sid;
    @TableField(exist = false)
    private List<Integer> rid;
    @TableField("addType")
    private Integer addType;
}