Merge branch 'hotfix/v4.7.14.3' of ssh://192.168.3.207:10022/qmx/jy into hotfix/v4.7.14.3

src/jfw/modules/subscribepay/src/entity/shareFission.go

@@ -91,6 +91,8 @@ func Order(userid, starttime, endtime string, types, dayNum int, remark string)
 	if types == 2 {
 		filter.Area = &map[string]interface{}{"北京": []string{}}
 		filter.Industry = []string{}
+	} else {
+		util.MergeKws(userid)
 	}
 	filterStr, _ := json.Marshal(filter)
 	ordercode := pay.GetOrderCode(userid)