Merge branch 'master' of zcb/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/service/CashierService.java

@@ -74,5 +74,5 @@ public interface CashierService {
      * @param machineCode
      * @return
      */
-    CashierEntity queryByMachineCode(String machineCode);
+    CashierEntity queryByMachineCode(String machineCode,String storeId);
 }