Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java

@@ -39,7 +39,6 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic
         String customerId = paCustomerAgencyDao.getCustomerIdByUserId(userId);
         //获取预授权码
         String preAuthCode = componentVerifyTicketService.preAuthCode();
-//        String redirectUrl = String.format(WxMaCodeConstant.API_RETURN_REDIRECT_URL, customerId,formDTO.getClientType());
         String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType();
         String authUrl = String.format(WxMaCodeConstant.API_AUTH_REGISTER_URL, componentAppId, preAuthCode, redirectUrl);
         result.setUrl(authUrl);

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthCodeDao.xml

@@ -9,7 +9,7 @@
             (
                 REPLACE ( UUID(), '-', '' ),
                 #{customerId},
-                #{clientType}
+                #{clientType},
                 #{authCode},
                 #{expiresInTime},
                 #{delFlag},