Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/resources/application.yml
3 years ago · 98ecba0e20
1 changed files with 1 additions and 0 deletions
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -260,6 +260,7 @@ renren:
    - /ws/**
    - /custom/epidemicSentryPost/downloadQRCode/**
    - /sys/screen/** # 大屏使用相关接口
    - /events/itemScreen/**
    - /events/itemstatis/**
    - /events/screen/**
    - /events/item/getItemStatisListPage