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

maven

2 天以前 61b1802b1b26fc35c07fd09edc4ff2ff8ade6688

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

@@ -25,7 +25,17 @@
    /**

     * 唯一标识

     */

    private String uuid = "";

    private String uuid;



    private Long factoryId;



    public Long getFactoryId() {

        return factoryId;

    }



    public void setFactoryId(Long factoryId) {

        this.factoryId = factoryId;

    }



    public String getUsername()

    {