beauty-erp.git - Gitblit

summary
reflog
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-13 ee0fc4d9b4412cc1c0365b8ac7dd43b78f98a038

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java

@@ -153,7 +153,7 @@
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/moneyCardPay/{orderId}")
    @GetMapping(value = "/moneyCardPay/{orderId}")
    @ResponseBody
    @Transactional
    public   AjaxResult moneyCardPay(@PathVariable Integer orderId) throws Exception {

			@@ -153,7 +153,7 @@
			* @return
			* @throws Exception
			*/
			@PostMapping(value = "/moneyCardPay/{orderId}")
			@GetMapping(value = "/moneyCardPay/{orderId}")
			@ResponseBody
			@Transactional
			public AjaxResult moneyCardPay(@PathVariable Integer orderId) throws Exception {