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

2 years ago · a5bf094e42
parent 46775061af 5bf6a8aac5
commit a5bf094e42
2 changed files with 973 additions and 866 deletions
--- a/data_base_design/天泽数据大平台.pdm
+++ b/data_base_design/天泽数据大平台.pdm
--- a/web/src/main/java/com/ibeetl/jlw/entity/Competition.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/Competition.java
@ -1,6 +1,7 @@
 package com.ibeetl.jlw.entity;

 import cn.jlw.validate.ValidateConfig;
+import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;