Merge remote-tracking branch 'remotes/origin/dev_voice_attachment' into dev_temp

# Conflicts: # epmet-gateway/src/main/resources/bootstrap.yml
4 years ago · 2506cff2fa
2 changed files with 3 additions and 0 deletions
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@ -460,6 +460,8 @@ epmet:
    - /epmet/ext/**
    - /data/stats/**
    - /data/aggregator/**
    - /gov/voice/**
    - /resi/voice/**
  # 内部认证url白名单(在白名单中的，就不会再校验登录了)
  internalAuthUrlsWhiteList:
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
@ -166,6 +166,7 @@
        SELECT
            dc.CONTENT_TYPE,
            dc.CONTENT,
            dc.FILE_NAME,
            dc.AUDIT_STATUS,
            dc.AUDIT_REASON
        FROM