Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-common/src/main/java/com/dsk/common/exception/file/InvalidExtensionException.java

@@ -9,7 +9,8 @@ import java.util.Arrays;
  *
  * @author dsk
  */
-public class InvalidExtensionException extends FileUploadException
+//public class InvalidExtensionException extends FileUploadException
+public class InvalidExtensionException extends RuntimeException
 {
     private static final long serialVersionUID = 1L;
 

dsk-operate-ui/src/views/detail/groupAccount/index.vue

@@ -60,7 +60,6 @@
         this.details=res.data;
       })
       infoMemberCount({combineId: this.customerId}).then(res=>{
-        console.log(res.data)
         if(res.code==200){
           this.statisticObj = res.data
         }

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -377,13 +377,13 @@ export default {
                 return this.$message.warning("抱歉，没找到相关数据,建议调整关键词或筛选条件，重新搜索")
             }
             let item = this.searchList[0]
-            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}&cid=${item.combineMemberCid}`})
+            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}`})
         },
         selCompany(item = this.searchList[0]){
             if(!item){
                 return this.$message.warning("抱歉，没找到相关数据,建议调整关键词或筛选条件，重新搜索")
             }
-            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}&cid=${item.combineMemberCid}`})
+            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}`})
         },
     }
 }