Merge remote-tracking branch 'origin/master'

zhangherong

10 天以前 1ee0b1a27899d03f946a86c70c4df4c6388fb160

 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;
    }