Merge branch 'developer'

姜友瑶

2022-05-17 b63b60288025c131b7d6023d444417ab5b35e2c1

 zq-erp/src/main/java/com/matrix/beauty/followup/entry/SysFollowup.java

File was renamed from zq-erp/src/main/java/com/matrix/system/hive/bean/SysFollowup.java
@@ -1,13 +1,13 @@
package com.matrix.system.hive.bean;
package com.matrix.beauty.followup.entry;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.pojo.EntityDTO;
import com.matrix.core.anotations.Extend;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.common.bean.EntityDTOExt;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.bean.SysFollowupComment;
import com.matrix.system.hive.bean.SysVipAlbum;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.NotNull;
import java.util.Date;