From b4dbc051f443aa576461473902e644326e2a8502 Mon Sep 17 00:00:00 2001
From: crazywoola <427733928@qq.com>
Date: Mon, 26 May 2025 18:09:07 +0800
Subject: [PATCH] resolve conflicts

---
 api/fields/app_fields.py                | 1 +
 api/models/model.py                     | 9 +++++++++
 web/app/(commonLayout)/apps/AppCard.tsx | 3 ++-
 web/types/app.ts                        | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/api/fields/app_fields.py b/api/fields/app_fields.py
index 416870cafa..de61094415 100644
--- a/api/fields/app_fields.py
+++ b/api/fields/app_fields.py
@@ -100,6 +100,7 @@ app_partial_fields = {
     "updated_at": TimestampField,
     "tags": fields.List(fields.Nested(tag_fields)),
     "access_mode": fields.String,
+    "create_user_name": fields.String,
 }
 
 
diff --git a/api/models/model.py b/api/models/model.py
index ee79fbd6b5..802157b8cf 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -294,6 +294,15 @@ class App(Base):
 
         return tags or []
 
+    @property
+    def create_user_name(self):
+        if self.created_by:
+            account = db.session.query(Account).filter(Account.id == self.created_by).first()
+            if account:
+                return account.name
+
+        return None
+
 
 class AppModelConfig(Base):
     __tablename__ = "app_model_configs"
diff --git a/web/app/(commonLayout)/apps/AppCard.tsx b/web/app/(commonLayout)/apps/AppCard.tsx
index 468c8244c0..7829df70bf 100644
--- a/web/app/(commonLayout)/apps/AppCard.tsx
+++ b/web/app/(commonLayout)/apps/AppCard.tsx
@@ -317,8 +317,9 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => {
             <AppTypeIcon type={app.mode} wrapperClassName='absolute -bottom-0.5 -right-0.5 w-4 h-4 shadow-sm' className='h-3 w-3' />
           </div>
           <div className='w-0 grow py-[1px]'>
-            <div className='flex items-center text-sm font-semibold leading-5 text-text-secondary'>
+            <div className='flex items-center justify-between text-sm font-semibold leading-5 text-text-secondary'>
               <div className='truncate' title={app.name}>{app.name}</div>
+              <div className='truncate'>{app.create_user_name}</div>
             </div>
             <div className='flex items-center text-[10px] font-medium leading-[18px] text-text-tertiary'>
               {app.mode === 'advanced-chat' && <div className='truncate'>{t('app.types.advanced').toUpperCase()}</div>}
diff --git a/web/types/app.ts b/web/types/app.ts
index a6d2faea55..e6ba9a2386 100644
--- a/web/types/app.ts
+++ b/web/types/app.ts
@@ -316,6 +316,8 @@ export type App = {
   name: string
   /** Description */
   description: string
+  /** UserName */
+  create_user_name: string;
 
   /**
    * Icon Type