Merge remote-tracking branch 'origin/dev/2025a' into dev/2025a

# Conflicts:
#	src/views/orders/components/MailBox.jsx

src/views/orders/components/MailBox.jsx

@@ -156,9 +156,8 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
               </div>
               <div className='flex-1 pl-2'>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
-                  <span className='font-bold'>{item.title}</span>
-                  <span className='text-neutral-500 text-wrap break-words break-all '>{item.description + ' ' + item.mailDate}</span>
-                  {item.orderNo + ' ' + (item.country === null ? '' : item.country)}
+                  <div>{item.orderNo + ' - '}<span className='font-bold'>{item.title}</span></div>
+                  <span className='text-neutral-500 text-wrap break-words break-all '>{'[' + (item.country === null ? '' : item.country) + '] ' + item.description + ' ' + item.mailDate}</span>
                 </Flex>
               </div>
             </li>
@@ -166,7 +165,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
         />
       </div>
 
-      <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
+      {/* <Drawer title={'高级搜索'} placement='top'  size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
         <Form
           layout={'vertical'}
           form={form}
@@ -198,7 +197,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
             </Col>
           </Row>
         </Form>
-      </Drawer>
+      </Drawer> */}
     </>
   )
 }