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

liyong

7 天以前 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

 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()

    {