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

huliguo

6 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -28,5 +28,6 @@
    @ApiModelProperty(value="紧急情况")
    private String emergencyState;;


    @ApiModelProperty(value = "跟进时间")
    private String followTime;
}