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

xiaoyong931011

2021-06-24 97e758e26fd44d4b907daf509f8a014f3453d8b4

 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;
}