Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

wzy

2021-11-28 c76890a550f386a52a7111e3d87242ab35af5b41

 zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java

@@ -27,6 +27,6 @@
    /**
     * 终端标识
     */
    private String webClientId;
    private String loginQrCodeKey;

}