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

zss

昨天 e595c86c223563a178b9bb0d0dcb8b0c3c3771c0

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

    {