Merge branch 'CRM15.5' into debug

pages-roadshow/addActivity/byCell.vue

@@ -325,9 +325,9 @@
 				this.formData.activityType = defaultActivityType;
 				if(this.isRaiRole){
 					this.formData.activityType = "路演"
-				}else{
+				}/* else{
 					delete this.areaList.county_list
-				}
+				} */
 				
 				if(options.defaultOpt) {
 					this.defaultResearcher = JSON.parse(options.defaultOpt);

pages-roadshow/addActivity/index.vue

@@ -331,9 +331,9 @@
 				}];
 				if(this.isRaiRole){
 					this.formData.activityType = "路演"
-				}else{
+				}/* else{
 					delete this.areaList.county_list
-				}
+				} */
 				
 				/* 编辑时回显表单 */
 				if(options.edit_id) {