From e51ee8c0bf96cc4823f4542bd69a37be2dfa06a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Wed, 31 Dec 2025 11:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1beans=E5=8C=85=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beans/beans.go          | 22 ++++++++++++++++++++++
 do/base_do.go           | 21 ---------------------
 log/model/entity/log.go |  4 ++--
 utils/utils.go          |  4 ++--
 4 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 do/base_do.go

diff --git a/beans/beans.go b/beans/beans.go
index 5254575..53edaa7 100644
--- a/beans/beans.go
+++ b/beans/beans.go
@@ -1,9 +1,31 @@
 package beans
 
+import (
+	"time"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
+)
+
 type ResponseEmpty struct {
 }
+
 type Page struct {
 	PageNum  int `p:"pageNum"`  //当前页码
 	PageSize int `p:"pageSize"` //每页数
 	Total    int //总页数
 }
+
+type MongoBaseDO struct {
+	Id        bson.ObjectID `bson:"_id,omitempty" json:"id"` // MongoDB 默认 ID
+	Creator   interface{}   `bson:"creator,omitempty" json:"creator"`
+	CreatedAt time.Time     `bson:"createdAt,omitempty" json:"createdAt"`
+	Updater   interface{}   `bson:"updater,omitempty" json:"updater"`
+	UpdatedAt time.Time     `bson:"updatedAt,omitempty" json:"updatedAt"`
+	TenantId  interface{}   `bson:"tenantId" json:"tenantId" default:"1"` // 租户ID
+	IsDeleted bool          `bson:"isDeleted" json:"isDeleted" default:"false"`
+}
+
+type User struct {
+	UserName interface{} `bson:"userName" json:"userName"` // MongoDB 默认 ID
+	TenantId interface{} `bson:"tenantId" json:"tenantId"` // 租户ID
+}
diff --git a/do/base_do.go b/do/base_do.go
deleted file mode 100644
index 5c4001f..0000000
--- a/do/base_do.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package do
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/v2/bson"
-)
-
-type MongoBaseDO struct {
-	Id        bson.ObjectID `bson:"_id,omitempty" json:"id"` // MongoDB 默认 ID
-	Creator   interface{}   `bson:"creator,omitempty" json:"creator"`
-	CreatedAt time.Time     `bson:"createdAt,omitempty" json:"createdAt"`
-	Updater   interface{}   `bson:"updater,omitempty" json:"updater"`
-	UpdatedAt time.Time     `bson:"updatedAt,omitempty" json:"updatedAt"`
-	TenantId  interface{}   `bson:"tenantId" json:"tenantId" default:"1"` // 租户ID
-	IsDeleted bool          `bson:"isDeleted" json:"isDeleted" default:"false"`
-}
-type User struct {
-	UserName interface{} `bson:"userName" json:"userName"` // MongoDB 默认 ID
-	TenantId interface{} `bson:"tenantId" json:"tenantId"` // 租户ID
-}
diff --git a/log/model/entity/log.go b/log/model/entity/log.go
index cfa8f28..ca59c9b 100644
--- a/log/model/entity/log.go
+++ b/log/model/entity/log.go
@@ -1,12 +1,12 @@
 package entity
 
 import (
-	"gitee.com/red-future---jilin-g/common/do"
+	"gitee.com/red-future---jilin-g/common/beans"
 )
 
 // OperationLog 操作日志实体 - 用于记录数据增删改操作行为
 type OperationLog struct {
-	do.MongoBaseDO `bson:",inline"`
+	beans.MongoBaseDO `bson:",inline"`
 
 	ServiceName  string                 `bson:"service_name" json:"service_name"`   // 服务名：具体的微服务名称
 	Collection   string                 `bson:"collection" json:"collection"`       // 集合名：数据所在的集合名称
diff --git a/utils/utils.go b/utils/utils.go
index c18874d..68f8c87 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"time"
 
-	"gitee.com/red-future---jilin-g/common/do"
+	"gitee.com/red-future---jilin-g/common/beans"
 	"github.com/gogf/gf/v2/database/gredis"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -59,7 +59,7 @@ func GetMonthToday(t time.Time, month int) time.Time {
 	}
 	return target.AddDate(0, 0, t.Day()-1)
 }
-func GetUserInfo(ctx context.Context) (user do.User, err error) {
+func GetUserInfo(ctx context.Context) (user beans.User, err error) {
 	r := g.RequestFromCtx(ctx)
 	if r != nil {
 		redisAddr := g.Cfg().MustGet(ctx, "redis.default.address").String()