Merge branch 'main' into codex/withdraw-remove-type

src/app/(main)/feedbacks/page.tsx

@@ -122,31 +122,13 @@ const renderReview = (f: Feedback) => {
 
 // 机型 / OS版本(提交反馈时的端环境;改版前历史反馈无 → -)
 const renderDeviceOs = (f: Feedback) => {
-  const modelName = f.device_model_name || f.device_model;
-  const rawModel =
-    f.device_model_name && f.device_model_name !== f.device_model ? f.device_model : null;
-  const romHasVersion = /\d/.test(f.rom_name || '');
-  const vendorOs = [
-    f.rom_name,
-    f.rom_version && !romHasVersion ? f.rom_version : null,
-  ]
-    .filter(Boolean)
-    .join(' ');
-  const os = [
-    vendorOs || null,
-    f.android_version ? `Android ${f.android_version}` : null,
-  ]
+  const os = [f.android_version ? `Android ${f.android_version}` : null, f.rom_name]
     .filter(Boolean)
     .join(' · ');
-  if (!modelName && !os) return <Text type="secondary">-</Text>;
+  if (!f.device_model && !os) return <Text type="secondary">-</Text>;
   return (
     <Space direction="vertical" size={0}>
-      <Text>{modelName || '-'}</Text>
-      {rawModel ? (
-        <Text type="secondary" style={{ fontSize: 12 }}>
-          {[f.device_manufacturer, rawModel].filter(Boolean).join(' · ')}
-        </Text>
-      ) : null}
+      <Text>{f.device_model || '-'}</Text>
       {os ? (
         <Text type="secondary" style={{ fontSize: 12 }}>
           {os}
@@ -370,7 +352,7 @@ export default function FeedbacksPage() {
     {
       title: '机型 / OS版本',
       key: 'device',
-      width: 180,
+      width: 150,
       render: (_: unknown, f: Feedback) => renderDeviceOs(f),
     },
     {

src/lib/types.ts

@@ -377,10 +377,7 @@ export interface Feedback {
   // 提交端环境快照:提交版本号 / 机型OS版本;改版前的历史反馈为 null
   app_version: string | null;
   device_model: string | null;
-  device_model_name: string | null;
-  device_manufacturer: string | null;
   rom_name: string | null;
-  rom_version: number | null;
   android_version: string | null;
   // 联表瞬态:展示完整手机号(点手机号查该用户全部反馈)
   phone: string | null;