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

xiaoyong931011

2021-06-30 44400f2f3427791c5382b02d70c4c0ef8d0c49ed

 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;