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

xiaoyong931011

2021-06-24 1998608fb160470b1cd6d139373290986a54b201

 gc-shop/src/main/java/com/xzx/gc/shop/dto/DeleteGoodsCategoryDto.java

@@ -4,5 +4,5 @@

@Data
public class DeleteGoodsCategoryDto {
    private long id;
    private Long id;
}