Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

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

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

}