Merge branch 'fea-cmpt' into fea-phone

app/src/main/java/com/bgycc/smartcanteen/qrcode/DefaultQRCodeScan.java

@@ -13,8 +13,8 @@ public class DefaultQRCodeScan implements IQRCodeScan {
     private Serial serial;
     private Serial serial;
     private InputStream serialPortIS;
     private InputStream serialPortIS;
 
 
-    public DefaultQRCodeScan(String filePath) throws Exception {
-        serial = new Serial(filePath, 115200, 0);
+    public DefaultQRCodeScan(String portPath) throws Exception {
+        serial = new Serial(portPath, 115200, 0);
         this.serialPortIS = serial.getInputStream();
         this.serialPortIS = serial.getInputStream();
     }
     }