Merge branch 'developer' into 'master'

Developer

See merge request !21

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());