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

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 screen-manage/src/main/java/com/moral/api/entity/Test.java

@@ -1,12 +1,13 @@
package com.moral.api.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;

/**
 * <p>
 *