Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 server/dmmall_service/src/main/resources/application-dev.yml

@@ -50,7 +50,7 @@
wx:
  pay:
    appId: wxcd2b89fd2ff065f8
    appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
    appSecret: 3462fa186da7cb06c544df8d8664b63a
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/dmmall_interface/web/api/wxPayNotify