huangxuechao e00bbf9a2c Merge remote-tracking branch 'origin/test' into test 4 gadi atpakaļ
..
java 5941c29846 修改线上gateway配置文件---test 4 gadi atpakaļ
resources e00bbf9a2c Merge remote-tracking branch 'origin/test' into test 4 gadi atpakaļ