Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus

疯狂的狮子li

2021-06-23 1488a09b8ee6a4f4980a25dada3425f9894d8327

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

@@ -7,7 +7,6 @@
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.annotation.Excel;

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