Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java

@@ -219,7 +219,7 @@ public class OfflineStrategy implements PayStrategy {
         // gic
         approvalDTO.setPlatformType(1);
         if (outPayDTO.getInitiatorUser() != null) {
-            UserDTO userDTO = userApiService.getUserById(outPayDTO.getInitiatorUser()).getResult();
+            UserDTO userDTO = userApiService.getUserInfoById(outPayDTO.getInitiatorUser()).getResult();
             if (userDTO != null) {
                 approvalDTO.setInitiatorType(userDTO.getLoginType() == 0 ?
                         BillingInitiatorTypeEnum.ENTERPRISE.getCode() : BillingInitiatorTypeEnum.OPERATION.getCode());

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/LoginController.java

@@ -122,6 +122,7 @@ public class LoginController {
                 temp.setUserName(userDetailsVO.getRealName());
                 temp.setPhoneAreaCode(Constants.NATION_CODE);
                 temp.setSuperAdmin(1);
+                temp.setLoginType(1);
                 ServiceResponse<Integer> saveResult = userApiService.saveOperationUser(temp);
                 user = temp;
                 user.setUserId(saveResult.getResult());