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

疯狂的狮子li

2021-06-17 a8c1d02ee14a3aa01dc02f496a9e4a61b6abdf99

 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}