Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-19 75e4afe327894168f7d65e87b9fbf0fac4612db3

 cloud-server-other/src/main/java/com/dsh/other/model/QueryMySiteVo.java

@@ -32,5 +32,5 @@
    @ApiModelProperty("状态（0=待支付，1=待核销，2=已到店，3=已完成，4=已过期，5=已取消）")
    private Integer status;
    @ApiModelProperty("创建时间")
    private String insertTime;
    private Long insertTime;
}