Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-04-14 f093da99ecb963d19d62dc0f242f00b20bc8895c

 ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -6,9 +6,8 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.HashMap;
import java.math.BigDecimal;
import com.ruoyi.common.annotation.Excel;

/**
 * ${functionName}对象 ${tableName}