Merge remote-tracking branch 'origin/master'

cuilei

16 小时以前 76c5ad320495758d4e76d852d96914f1b405ece7

 src/main/java/org/jeecg/modules/base/entity/UserFactory.java

@@ -53,7 +53,7 @@
    @ApiModelProperty(value = "工厂/车间/产线ID")
    private String factoryId;

    public UserFactory(String id, String factoryId) {
    public UserFactory(String factoryId, String id) {
        this.userId = id;
        this.factoryId = factoryId;
    }