Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-05-19 e64ac50998ba5fe69bac4baa667d0f5a216bc670

 src/main/java/cc/mrbird/febs/mall/entity/MallActSet.java

@@ -28,6 +28,8 @@
    private String actCode;
    //活动名称
    private String actName;
    //活动图片
    private String actImage;
    //开始时间
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date actStartTime;