Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/basicData/basicFeesDesc/index.vue

@@ -126,7 +126,10 @@ export default {
     //新增修改时保存触发
     rowSave(row, done, loading) {
       console.log(row)
-      row.feesTypeId = row.feesTypeId.join(',')
+      let type = typeof(row.feesTypeId)
+      if (type == 'object') {
+        row.feesTypeId = row.feesTypeId.join(',')
+      }
       typeSave(row).then(res => {
         this.page.currentPage = 1;
         this.onLoad(this.page, {parentId: 0});