quick translation update

src/i18n/zh/dashboard.json

@@ -56,9 +56,5 @@
   "No": "無",
   "Responsible Escalation List": "負責的上報列表",
   "show completed logs": "顯示已完成上報",
-<<<<<<< Updated upstream
-   "Rows per page": "每頁行數"
-=======
   "Rows per page": "每頁行數"
->>>>>>> Stashed changes
 }

src/i18n/zh/pickOrder.json

@@ -257,7 +257,7 @@
         "Pick Execution Detail":"進行提料詳情",
         "Submit Required Pick Qty":"提交所需提料數量",
         "Scan Result":"掃描結果",
-        "Ticket No.":"提單號碼",
+        "Ticket No.":"提票號碼",
         "Start QR Scan":"開始QR掃描",
         "Stop QR Scan":"停止QR掃描",
         "Scanning...":"掃描中...",