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

liyong

5 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

 src/main/java/com/ruoyi/framework/security/LoginBody.java

@@ -27,6 +27,16 @@
     */

    private String uuid;



    private Long factoryId;



    public Long getFactoryId() {

        return factoryId;

    }



    public void setFactoryId(Long factoryId) {

        this.factoryId = factoryId;

    }



    public String getUsername()

    {

        return username;