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

zss

昨天 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

 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;