Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec into test

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -197,7 +197,7 @@ public class PaymentController extends BaseController {
         } catch (Exception e) {
             return e.getMessage();
         }
-        return "succeeded";
+        return "SUCCESS";
     }
 
 }