resolve conflicts

api/fields/app_fields.py

@@ -101,6 +101,7 @@ app_partial_fields = {
     "tags": fields.List(fields.Nested(tag_fields)),
     "access_mode": fields.String,
     "create_user_name": fields.String,
+    "author_name": fields.String,
 }
 
 

api/models/model.py

@@ -295,7 +295,7 @@ class App(Base):
         return tags or []
 
     @property
-    def create_user_name(self):
+    def author_name(self):
         if self.created_by:
             account = db.session.query(Account).filter(Account.id == self.created_by).first()
             if account:

web/app/(commonLayout)/apps/AppCard.tsx

@@ -319,7 +319,7 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => {
           <div className='w-0 grow py-[1px]'>
             <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 className='truncate'>{app.author_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>}

web/types/app.ts

@@ -316,8 +316,8 @@ export type App = {
   name: string
   /** Description */
   description: string
-  /** UserName */
+  /** Author Name */
-  create_user_name: string;
+  author_name: string;
 
   /**
    * Icon Type