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

puzhibing

2023-12-08 f0753e3b608ba47deaaf4619924bb8765003fd1d

 cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseIncomeVo.java

@@ -17,7 +17,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class PointMerchandiseIncomeVo {
    @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;
    private BigDecimal cash;
}