Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

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

@@ -46,5 +46,9 @@
    @ApiModelProperty(value="下次任务内容")
    private String nextTaskContent;

    @ApiModelProperty(value="跟踪类型")
    private String customFollowType;

    @ApiModelProperty(value="紧急程度")
    private String emergencyState;
}