From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java
index 8fa8f3e..bf9a270 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java
+++ b/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;;
 }

--
Gitblit v1.7.1