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

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AuditLogController.java

@@ -74,7 +74,8 @@ public class AuditLogController {
 
     private void createLog(AuditLogDTO auditLogDTO) {
         ServiceResponse<AuditLogDTO> auditLog = this.auditLogApiService.getAuditLog(auditLogDTO.getAuditLogId());
-        LogUtils.createLog("审核审批项", auditLog.getResult().getProjectItemName(), auditLogDTO.getAuditorName(), auditLog.getResult().getEnterpriseId(), auditLog.getResult().getEnterpriseName());
+        LogUtils.createLog("审核审批项", auditLog.getResult().getProjectItemName(), auditLogDTO.getAuditorName(),
+                auditLog.getResult().getEnterpriseId(), auditLog.getResult().getEnterpriseName(), "+86", auditLogDTO.getAuditorPhone());
     }
 
     @RequestMapping("/get-audit-log")

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/PackageController.java

@@ -112,7 +112,8 @@ public class PackageController {
         ServiceResponse<BillingPayInfoDTO> serviceResponse = this.billingOrderApiService.
                 paySmsPackageOrder(enterpriseId, orderId, payType, authCode, UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         if(serviceResponse.isSuccess()){
-            LogUtils.createLog("套餐包支付", "订单id："+orderId);
+            BillingOrderDTO orderDTO = this.billingOrderApiService.getOrderById(orderId).getResult();
+            LogUtils.createLog("套餐包支付", orderDTO.getOrderContent());
             return RestResponse.success(serviceResponse.getResult());
         }
         return EnterpriseRestResponse.failure(serviceResponse);