Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/model/wx/WxPayRespVO.java

@@ -38,4 +38,9 @@ public class WxPayRespVO implements Serializable {
      */
     @ApiModelProperty("签名")
     private String paySign;
+    /**
+     * 签名签名算法
+     */
+    @ApiModelProperty("签名算法")
+    private String signType;
 }

src/main/java/com/ycwl/basic/service/impl/mobile/WxPayServiceImpl.java

@@ -106,6 +106,7 @@ public class WxPayServiceImpl implements WxPayService {
                     .collect(Collectors.joining("\n", "", "\n"));
             String sign = WXPayUtil.getSign(signatureStr, wechatConfig.getKeyPath());
             vo.setPaySign(sign);
+            vo.setSignType("RSA-SHA256");
             vo.setPrepayId("prepay_id=" + response.getPrepayId());
             return vo;
         } catch (ServiceException e) {