Merge remote-tracking branch 'origin/master'

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java

@@ -70,7 +70,12 @@
    /**
     * 窗口显示的高度
     */
    private Long height;
    private Integer height;

    /**
     * 过滤(级联)属性
     */
    private String useFormKey;

    /**
     * 过滤属性请求参数

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UIFieldSortVO.java

@@ -24,6 +24,14 @@
     */
    private String type;

    public UIFieldSortVO(String field, String type) {
        this.field = field;
        this.type = type;
    }

    public UIFieldSortVO() {
    }

    public String getField() {
        return field;
    }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java

@@ -338,6 +338,9 @@
        uiTableConfigVO.setQueryColumns(queryColumns);
        //set给表格配置属性
        uiFormReferVO.setTableConfig(uiTableConfigVO);
        //字段名不一致，需要手动set
        uiFormReferVO.setMuti(Func.toBoolean(codeReferConfig.getIsMuti()));
        uiFormReferVO.setInitSort(new UIFieldSortVO(codeReferConfig.getSortField(),codeReferConfig.getSortType()));
        // 筛选条件
        HashMap<String, String> whereMap = new HashMap<>();
        if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -1389,6 +1389,9 @@
        uiTableConfigVO.setQueryColumns(queryColumns);
        //set给表格配置属性
        uiFormReferVO.setTableConfig(uiTableConfigVO);
        //字段名不一致，需要手动set
        uiFormReferVO.setMuti(Func.toBoolean(codeReferConfig.getIsMuti()));
        uiFormReferVO.setInitSort(new UIFieldSortVO(codeReferConfig.getSortField(),codeReferConfig.getSortType()));
        // 筛选条件
        HashMap<String, String> whereMap = new HashMap<>();
        if(!CollectionUtils.isEmpty(codeReferConfig.getCodeSrchCondConfigVOS())){