From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Wed, 09 Jun 2021 20:44:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java index 2c08183..fe414cc 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java @@ -3,6 +3,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.matrix.core.anotations.Extend; import com.matrix.core.tools.DateUtil; +import com.matrix.system.app.dto.BasePageDto; +import com.matrix.system.common.bean.EntityDTOExt; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -11,7 +13,7 @@ * * @date 2019-03-24 23:55 */ -public class AchieveNew implements Serializable{ +public class AchieveNew extends EntityDTOExt { @Extend private static final long serialVersionUID = 1L; @@ -26,7 +28,7 @@ /** - * 美疗师id + * 美疗师id 把这个字段视为正式的业绩归属人 */ private Long beaultId; -- Gitblit v1.9.1