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

eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java

@@ -82,6 +82,11 @@ public class AbMessage implements Serializable {
     @ApiModelProperty(value = "上游推送时间")
     private Timestamp pushTime;
 
+    /** 添加性别  modify by wzx  */
+    @Column(name = "sex")
+    @ApiModelProperty(value = "声纹识别性别标签")
+    private Integer sex;
+
     public void copy(AbMessage source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

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

@@ -34,6 +34,11 @@ public class AbMessageQueryCriteria{
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
     private String actName;
+
+    /** 精确 查询性别  modify by wzx  */
+    @Query
+    private Integer sex;
+
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> startTime;

eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java

@@ -106,6 +106,11 @@ public class FormMessage implements Serializable {
     @ApiModelProperty(value = "最新推送时间")
     private Timestamp pushTime;
 
+    /** 添加性别  modify by wzx  */
+    @Column(name = "sex")
+    @ApiModelProperty(value = "声纹识别性别标签")
+    private Integer sex;
+
     public void copy(FormMessage source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

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

@@ -47,6 +47,11 @@ public class FormMessageQueryCriteria{
     /** 精确 */
     @Query
     private Integer device;
+
+    /** 精确 查询性别  modify by wzx  */
+    @Query
+    private Integer sex;
+
     /** BETWEEN */
     @Query(type = Query.Type.BETWEEN)
     private List<Timestamp> startTime;

pom.xml

@@ -127,11 +127,26 @@
         </dependency>
 
         <!-- 生成代码时候进行注释 -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.shardingSphere</groupId>-->
+<!--            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>-->
+<!--            <version>4.0.0-RC1</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>org.apache.shardingSphere</groupId>
+            <groupId>org.apache.shardingsphere</groupId>
             <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-            <version>4.0.0-RC1</version>
+            <version>4.1.1</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba</groupId>-->
+<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
+<!--            <version>${druid.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.shardingSphere</groupId>-->
+<!--            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>-->
+<!--            <version>4.7.1</version>-->
+<!--        </dependency>-->
         <!--Mysql依赖包-->
         <dependency>
             <groupId>mysql</groupId>