Merge branch 'dev/4.9.36_fu' of qmx/jy into feature/v4.9.36

src/jfw/modules/subscribepay/src/service/dataexportPack.go

@@ -74,13 +74,11 @@ func (des *DataExportPack) ScreenList() {
 				var industry []string
 				if industrys := qutil.ObjArrToStringArr(dataMap["industry"].([]interface{})); len(industrys) > 0 {
 					for _, v := range industrys {
-						log.Println(v, "++++++++++", strings.Contains(v, "其它"))
 						if !strings.Contains(v, "其它") {
-							industry = append(industrys, v)
+							industry = append(industry, v)
 						}
 					}
 				}
-				log.Printf("---------------------行业 其它---------------------------------", industry)
 				dataMap["industry"] = strings.Join(industry, ",")
 				buyerclass, _ := dataMap["buyerclass"].([]interface{})
 				dataMap["buyerclass"] = strings.Join(qutil.ObjArrToStringArr(buyerclass), ",")