Merge branch 'master' into feature/v4.9.7

src/jfw/front/searchOptimize.go

@@ -458,9 +458,9 @@ func (so *SearchOptimize) GetSearchQuery(mustQuery string) (qstr string) {
 		} else {
 			wordsMusts = append(wordsMusts, keyWordsMusts...)
 		}
-		//附加词
-		if so.AdditionalWords != "" {
-		}
+	}
+	//附加词
+	if so.AdditionalWords != "" {
 		//多组附加词，每组间,号隔开。每组内如果关键词中间有空格，自动分词
 		var (
 			addWordsMusts []string

src/jfw/modules/subscribepay/src/config.json

@@ -173,17 +173,18 @@
     },
     "mailAlarm": {
       "to": [
+        "liumingliang@topnet.net.cn","zhaozhenzhen-jyyyb@topnet.net.cn","wangshan@topnet.net.cn","yanpeizhu@topnet.net.cn","yangliang@topnet.net.cn"
       ],
       "title": "赠送兑换码活动库存告警",
       "reTry": 3,
       "threshold": {
         "0": {
           "name": "月度",
-          "value": 30
+          "value": 50
         },
         "1": {
           "name": "年度",
-          "value": 30
+          "value": 5
         }
       }
     },