From 21808c876d9d64ed9d3c2351732aa9605450d17a Mon Sep 17 00:00:00 2001 From: ShiJiuZhou <15315423958@163.com> Date: Sat, 28 Feb 2026 15:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=B7=A5?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/system/pojo/entity/User.java | 5 ++++- .../main/java/org/springblade/system/pojo/vo/UserVO.java | 5 +++++ .../desk/common/controller/MesNotifyMessageController.java | 2 ++ doc/sql/mes/increase-260225.sql | 7 ++++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java index 9da81017..6186a7fa 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java @@ -114,6 +114,9 @@ public class User extends TenantEntity { * 是否主管 */ private Integer isLeader; - + /** + * 工号 + */ + private String workNo; } diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/vo/UserVO.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/vo/UserVO.java index 8da8418e..2509830c 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/vo/UserVO.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/vo/UserVO.java @@ -93,4 +93,9 @@ public class UserVO extends User { * 拓展信息 */ private String userExt; + + /** + * 工号 + */ + private String workNo; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/controller/MesNotifyMessageController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/controller/MesNotifyMessageController.java index cdae4adc..c999a952 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/controller/MesNotifyMessageController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/controller/MesNotifyMessageController.java @@ -31,6 +31,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.log.annotation.ApiLog; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -69,6 +70,7 @@ public class MesNotifyMessageController extends BladeController { * 通知消息 删除 */ @PostMapping("/remove") + @ApiLog("删除通知消息") @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(mesNotifyMessageService.deleteLogic(Func.toLongList(ids))); diff --git a/doc/sql/mes/increase-260225.sql b/doc/sql/mes/increase-260225.sql index 96f3b8d4..21ac3745 100644 --- a/doc/sql/mes/increase-260225.sql +++ b/doc/sql/mes/increase-260225.sql @@ -121,4 +121,9 @@ COMMENT ON COLUMN "JONHON_MES"."MES_NOTIFY_MESSAGE"."STATUS" IS '已读状态 0 COMMENT ON COLUMN "JONHON_MES"."MES_NOTIFY_MESSAGE"."IS_DELETED" IS '是否已删除'; -COMMENT ON TABLE "JONHON_MES"."MES_NOTIFY_MESSAGE" IS '通知消息' \ No newline at end of file +COMMENT ON TABLE "JONHON_MES"."MES_NOTIFY_MESSAGE" IS '通知消息' + +ALTER TABLE BLADE_USER + ADD WORK_NO VARCHAR2(50); + +COMMENT ON COLUMN BLADE_USER.WORK_NO IS '工号';