Merge branch 'dev' into 'mp-server-test'

公钥

See merge request quanshu/mp-server!1055

mp-admin/src/main/resources/application-test.yml

@@ -150,7 +150,7 @@ bind:
 # 银盛支付配置
 ys-pay:
   private-key-path: /home/quanshu/mp-server/data/ysPayPre.pfx
-  public-key-path: /home/quanshu/mp-server/cert/businessgate.cer
+  public-key-path: /home/quanshu/mp-server/data/businessgate.cer
   # 支付完后跳转
   return-url: https://test-mp-h5.quanshu123.com
   # 回调地址