Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

3 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppMemberGoodsTypeDto.java

@@ -18,5 +18,6 @@
    @ApiModelProperty(value = "商品类型")
    private HashSet<String> goodsTypeSet;


    @ApiModelProperty(value = "商品调理问题")
    private HashSet<String> goodsNurseSet;
}