Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/common/actions/TestActionBB.java

@@ -2,11 +2,11 @@

import com.matrix.component.wechat.externalInterface.weixinUtil.WeixinServiceUtil;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.UUIDUtil;
import com.matrix.core.web.BaseAction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

@@ -21,10 +21,10 @@
   WeixinServiceUtil weixinServiceUtil;


   @GetMapping(value = "/testPay")
   @GetMapping(value = "/testPay/{no}")
   @ResponseBody
   public AjaxResult hiveMobileLoginOut() {
      weixinServiceUtil.comPay("提现", UUIDUtil.getRandomID(),1,"oJkRK4yelehsY4S7I6Ee1ydWtQMI",36L);
   public AjaxResult hiveMobileLoginOut(@PathVariable  String no) {
      weixinServiceUtil.comPay("提现", no,1,"oJkRK4yelehsY4S7I6Ee1ydWtQMI",36L);
      return AjaxResult.buildSuccessInstance("");
   }