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

huliguo

6 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtFollowShopTaskDto.java

@@ -23,6 +23,7 @@
    @ApiModelProperty(value="跟进类型")
    private String followType;


    @ApiModelProperty(value="跟进内容")
    private String followContent;