Merge branch 'master' of http://git.hchbox.com/yuyou/eladmin into master

eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java

@@ -39,7 +39,7 @@ public class AbMessageQueryCriteria{
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> createTime;
     /** BETWEEN */
-    @Query(type = Query.Type.BETWEEN)
+    @Query(type = Query.Type.IN)
     private List<Integer> clientType;
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)

eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java

@@ -37,8 +37,8 @@ public class FormMessageQueryCriteria{
     private String actName;
 
     /** 精确 */
-    @Query
+    @Query(type = Query.Type.IN)
-    private Integer stuGrade;
+    private List<Integer> stuGrade;
 
     /** 精确 */
     @Query