Merge branch 'developer' into 'master'

Developer

See merge request !29

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

@@ -250,7 +250,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
 //        }
         // 修改审批状态
         auditLogService.updateAudit(auditLogDTO);
-        if (StringUtils.isNotBlank(projectItem.getCallbackUrl())) {
+        if (!AuditTypeEnum.HAOBAN.getCode().equals(auditLogDTO.getAuditType()) && StringUtils.isNotBlank(projectItem.getCallbackUrl())) {
             // 回调
             String extraInfo = auditLog.getExtraInfo();
             JSONObject jsonObject = JSON.parseObject(extraInfo);

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

@@ -530,6 +530,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     @Override
     public ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense(Integer enterpriseId) {
         ServiceResponse<List<ApplicationLicenseDTO>> hasBuyLicense = enterpriseLicenseApiService.listEnterpriseBuyLicense(Arrays.asList(enterpriseId));
+        LOGGER.info("商户ID：{}，license信息:{}", JSON.toJSONString(hasBuyLicense));
         if (hasBuyLicense.isSuccess()) {
             List<ApplicationLicenseDTO> licenseList = hasBuyLicense.getResult();
             if (CollectionUtils.isNotEmpty(licenseList)) {