From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA

---
 src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/pojo/AccountSubject.java b/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
similarity index 95%
rename from src/main/java/com/ruoyi/account/pojo/AccountSubject.java
rename to src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
index 9616324..2548a9c 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountSubject.java
+++ b/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
@@ -1,4 +1,4 @@
-package com.ruoyi.account.pojo;
+package com.ruoyi.account.pojo.financial;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -85,7 +85,7 @@
      */
     @ApiModelProperty("鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
-    private String createUser;
+    private Integer createUser;
 
     /**
      * 鍒涘缓鏃堕棿
@@ -99,7 +99,7 @@
      */
     @ApiModelProperty("淇敼浜�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateUser;
+    private Integer updateUser;
 
     /**
      * 淇敼鏃堕棿

--
Gitblit v1.9.3