Merge branch 'master' of http://gogs.chelvc.com/wuyongqiang/maintain

src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java

@@ -138,7 +138,7 @@ public class OmsOrderController {
     }
 
     /**
-     *
+     * 订单核验
      *
      * @param orderId
      * @param merchantId