From 1bfec53e4e3a196a3ca53e06e9bec88139cbb689 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 一月 2024 18:06:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
index 8b8f1fe..9f8389c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
@@ -28,7 +28,7 @@
this.content=content;
this.applyId = apply.getId();
this.createDate =apply.getEditDate();
- this.editor =apply.getEditor();
+ this.creator =apply.getEditor();
this.status = apply.getStatus();
this.objId=objId;
this.objType = objType;
@@ -40,7 +40,7 @@
this.content=content;
this.applyId = apply.getId();
this.createDate =apply.getEditDate();
- this.editor =apply.getEditor();
+ this.creator =apply.getEditor();
this.status = apply.getStatus();
this.objId=objId;
this.objType = objType;
--
Gitblit v1.9.3