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

疯狂的狮子li

2021-04-19 97873a7b2b7bc2ee2d0f3cdb2c2454ff9156dab9

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

@@ -2,6 +2,7 @@

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;