| Merge remote-tracking branch 'origin/master' | 
|---|
| src/main/java/com/yn/bftl/thirdparty/modules/chinaums/service/impl/AuthServiceImpl.java | 
|---|
| src/main/java/com/yn/bftl/thirdparty/modules/chinaums/util/ByxChinaumsUtil.java | 
|---|