Merge remote-tracking branch 'origin/master'

92895

2020-11-23 3d85fd7de42ead48fd50a99ee3d5d29bbd403b3c

 service-front/src/main/java/com/java110/front/smo/ownerLogin/IOwnerAppLoginSMO.java

@@ -39,7 +39,7 @@
     * @return
     * @throws SMOException
     */
    ResponseEntity<String> getPageAccessToken(IPageData pd) throws SMOException;
    ResponseEntity<String> getPageAccessToken(IPageData pd,HttpServletRequest request) throws SMOException;


    /**
@@ -50,5 +50,6 @@
     * @throws SMOException
     */
    ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl, String errorUrl,
                                        String loginFlag,
                                        HttpServletRequest request, HttpServletResponse response) throws SMOException;
}