Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

src/view/ddkz/components/chatRoomMemberDialog.vue

@@ -139,6 +139,7 @@ export default {
     .personInfo-content {
         width: 100%;
         height: calc(100% - 50px);
+        overflow-y: auto;
 
         .everyTeam {
             width: calc(33% - 10px);

src/view/dfzy/dfzyrwk.vue

@@ -377,7 +377,7 @@ export default {
           module: this.types == 1 ? "DF" : "DFWW",
           combinationSearch:{
             chineseName: this.formInline.name,
-            foreignName: this.formInline.jc,
+            foreignName: this.formInline.wwm,
             xzzw: this.formInline.xzzw,
             rwjj: this.formInline.rwjj,
             bq: this.formInline.bq,