Merge branch 'master' of http://svn.2fi-solutions.com:8300/derek/FPSMS-frontend

src/components/PoSearch/PoSearch.tsx

@@ -142,14 +142,14 @@ const PoSearch: React.FC<Props> = ({
       },
       {
         name: "code",
-        label: `${t("PO No.")} &\n${t("Supplier")}`,
+        label: `${t("PO No.")} ${t("&")}\n${t("Supplier")}`,
         renderCell: (params) => {
           return <>{params.code}<br/>{params.supplier}</>
         },
       },
       {
         name: "orderDate",
-        label: `${t("Order Date")} &\n${t("ETA")}`,
+        label: `${t("Order Date")} ${t("&")}\n${t("ETA")}`,
         renderCell: (params) => {
           // return (
           //   dayjs(params.estimatedArrivalDate)

src/i18n/zh/purchaseOrder.json

@@ -156,5 +156,6 @@
   "joCode": "工單編號",
   "salesUnit": "銷售單位",
   "download Qr Code": "下載QR碼",
-  "downloading": "下載中"
+  "downloading": "下載中",
+  "&": "及"
 }