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

Pu Zhibing

5 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

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

@@ -23,5 +23,6 @@
    @ApiModelProperty(value = "任务内容")
    private String taskContent;


    @ApiModelProperty(value="紧急情况")
    private String emergencyState;;
}