From 46cc4c9307e3cc7060ae436f59f007831104884a Mon Sep 17 00:00:00 2001
From: Bull-BCLS <1019113057@qq.com>
Date: Fri, 1 Sep 2023 23:08:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=92=88=E5=AF=B9?=
 =?UTF-8?q?=E4=BA=8E=E8=BF=98=E6=9C=AA=E5=88=B0=E5=8F=91=E5=B8=83=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=9A=84=E5=85=AC=E5=91=8A=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charles7c/cnadmin/system/model/vo/AnnouncementVO.java | 8 ++++----
 continew-admin-ui/src/views/system/announcement/index.vue | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
index 4b3a4a41..99a9d33c 100644
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
@@ -66,17 +66,17 @@ public class AnnouncementVO extends BaseVO {
      * 
      * @return 公告状态
      */
-    @Schema(description = "状态（1：已发布，2：已过期）", example = "1")
+    @Schema(description = "状态（1：待发布，2：已发布，3：已过期）", example = "1")
     public Integer getStatus() {
-        int status = 1;
+        int status = 2;
         if (null != this.effectiveTime) {
             if (this.effectiveTime.isAfter(LocalDateTime.now())) {
-                status = 2;
+                status = 1;
             }
         }
         if (null != this.terminateTime) {
             if (this.terminateTime.isBefore(LocalDateTime.now())) {
-                status = 2;
+                status = 3;
             }
         }
         return status;
diff --git a/continew-admin-ui/src/views/system/announcement/index.vue b/continew-admin-ui/src/views/system/announcement/index.vue
index 40bfecd2..a0f7a910 100644
--- a/continew-admin-ui/src/views/system/announcement/index.vue
+++ b/continew-admin-ui/src/views/system/announcement/index.vue
@@ -135,8 +135,9 @@
           </a-table-column>
           <a-table-column title="状态" align="center">
             <template #cell="{ record }">
-              <a-tag v-if="record.status === 1" color="green">已发布</a-tag>
-              <a-tag v-else color="orangered">已过期</a-tag>
+              <a-tag v-if="record.status === 1" color="blue">待发布</a-tag>
+              <a-tag v-else-if="record.status === 2" color="green">已发布</a-tag>
+              <a-tag v-else color="red">已过期</a-tag>
             </template>
           </a-table-column>
           <a-table-column title="生效时间">

From 486da2f79bfc5379213bf666b8f325fb8096ebc6 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 2 Sep 2023 00:22:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs:=20=E6=9B=B4=E6=AD=A3=20README=20?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1a0bbeb5..434d57e6 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,7 @@ continew-admin
     ├─ public               # 公共静态资源（favicon.ico、logo.svg）
     ├─ src
     │  ├─ api               # 请求接口
+    │  │  ├─ demo             # 示例模块
     │  │  ├─ auth             # 认证模块
     │  │  ├─ common           # 公共模块
     │  │  ├─ monitor          # 系统监控模块
@@ -229,7 +230,7 @@ continew-admin
     │  ├─ types             # TypeScript 类型
     │  ├─ utils             # 工具库
     │  ├─ views             # 页面模板
-    │  │  ├─ arco-design      # Arco Design 相关示例模块
+    │  │  ├─ demo             # Arco Design 相关示例模块
     │  │  ├─ dashboard        # 仪表盘模块
     │  │  ├─ login            # 登录模块
     │  │  ├─ monitor          # 系统监控模块