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

huliguo

10 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopTaskRecordPageVo.java

@@ -27,6 +27,9 @@
    @ApiModelProperty(value = "用户头像")
    private String userPicture;

    @ApiModelProperty(value = "用户岗位")
    private String userPosition;

    @ApiModelProperty(value = "跟进id")
    private Long followId;