Merge remote-tracking branch 'origin/master'

fwq

2022-11-03 9811a61080777783e9d72e55c2a5cecad0439eeb

 crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsTypeDto.java

@@ -14,4 +14,6 @@
    private Integer expertArea;
    /**团购活动展示*/
    private Integer groupArea;
    /**搜索*/
    private String name;
}