Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

4 天以前 843d5b6dd50567dadcc56257f074840e80d757aa

 rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java

@@ -17,6 +17,8 @@

public class BaseController {



    public User getLoginUser() {
        try {
            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();