From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/C3mOrderVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/C3mOrderVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/C3mOrderVO.java
index a7428c9..c6b0257 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/C3mOrderVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/C3mOrderVO.java
@@ -23,7 +23,7 @@
     /**
      * 璁㈠崟ID
      */
-    @TableId
+
     private Long orderId;
 
     /**

--
Gitblit v1.9.3