Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 zq-erp/src/main/java/com/matrix/system/app/dto/LoginDto.java

@@ -20,6 +20,16 @@
    @NotBlank(message = "用户名或密码错误")
    private String password;

    private String openId;

    public String getOpenId() {
        return openId;
    }

    public void setOpenId(String openId) {
        this.openId = openId;
    }

    public String getUsername() {
        return username;
    }