Merge branch 'score_shop' into api_score_meger

jyy

2021-08-06 5f95864f021254fba9881cf0c738dc49d1f84b71

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

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

}