Merge branch 'master-v32-lushangqing' into 'master'

【无】业务视图下资源动态获取字段优化



See merge request !892

@@ -409,9 +409,9 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
-                        if(fieldExpandArr.indexOf(resType)!=-1){
+                        if(fieldExpandArr.indexOf('OperatingSystem')!=-1){
                         }else{
-                            fieldExpandArr.push(resType);
+                            fieldExpandArr.push('OperatingSystem');
                             if(arr.length>0){
                                 arr.map(item=>{
                                     let listStr='';