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

Helius

2021-07-15 bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed

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

@@ -24,7 +24,7 @@

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

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