Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

3 天以前 3033ccf3878fae2c204df53be2a283f29f5853ed

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

@@ -198,6 +198,8 @@
  conf:
    appId: wxa17e8d1331e50934
    secretId: 79c234527fd3b6553679d52be5e29b19
    appLiveResultTemplateId: 1wheNdyQ88Cz9Z7L1EXxR2L0u4X4LaeXoZVtZwHCagk
    officeAppLiveResultTemplateId: 7w1JVe3S4ClFnff7g8us7x-hqFuV3f2SKjKclP_X2FI
lakala:
  MerchantNo: 822290059430BFA
  TermNo: D9261078