Merge remote-tracking branch 'remotes/origin/ming' into test

Controller/UnicomCombo/WXTechController.py

@@ -215,7 +215,7 @@ class WXTechController(View):
             order_dict = {'orderID': order_id, 'UID': uid, 'rank_id': rank_id, 'ai_rank_id': ai_rank_id,
                           'userID_id': user_id, 'desc': combo_info_vo['combo_name'], 'payType': 10,
                           'payTime': n_time, 'price': combo_info_vo['price'], 'addTime': n_time,
-                          'updTime': n_time, 'status': 1,
+                          'updTime': n_time, 'status': 1, 'currency': 'CNY',
                           'unify_combo_id': str(combo_info_vo['id']), 'order_type': 3,
                           'store_meal_name': combo_info_vo['combo_name'],
                           'trade_no': trade_no}