Merge branch 'test' into dev

src/views/login.vue

@@ -65,7 +65,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2026 supguard All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -83,8 +83,8 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 
 const loginForm = ref({
-  username: 'zs',
-  password: '123',
+  username: 'admin',
+  password: '12345',
   rememberMe: false,
   code: '',
   uuid: ''

src/views/merchandise/components/comeInfo.vue

@@ -211,7 +211,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="是否直签" prop="isDirectSign" width="150">
+        <!-- <el-table-column label="是否直签" prop="isDirectSign" width="150">
           <template #header>
             <span class="required-label">是否直签</span>
           </template>
@@ -231,7 +231,7 @@
               />
             </el-select>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           label="对账公司"
           prop="reconciliationCompanyName"

src/views/register.vue

@@ -70,7 +70,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2026 supguard All Rights Reserved.</span>
     </div>
   </div>
 </template>