Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-06-29 2a53d6814b43d58d3b8b373fe2690f68e2e912a8

 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsCategoryListVo.java

@@ -21,9 +21,9 @@
    private Long parentId;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value="创建时间")
    private Date createdTime;
    private String createTime;

    @ApiModelProperty(value="创建人")
    private String createdBy;