Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/EquipmentsReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class EquipmentsReq {
+
+
+    private String typeId;
+
+    private String typeName;
+
+    private String sizeId;
+
+    private String sizeName;
+
+    private Integer num;
+
+    private Integer outNum;
+    private Integer inNum;
+    private BigDecimal price;
+
+    private BigDecimal outPrice;
+    private BigDecimal inPrice;
+}
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PoliceListReq.java

@@ -23,4 +23,6 @@ public class PoliceListReq {
     //     * 角色id列表
     //     */
     private List<Long> rolesList;
+
+    private List<EquipmentsReq> equipments;
 }

jyzb-boot/src/main/resources/application-local.yml

@@ -3,7 +3,7 @@ scanner:
 
 easy-es:
   enable: true
-  address: 192.168.3.188:9200
+  address: 192.168.3.121:9200
   username:
   password:
 

jyzb-boot/src/main/resources/application.yml

@@ -4,7 +4,7 @@
 
 easy-es:
   enable: true
-  address: 192.168.3.188:9200
+  address: 192.168.3.121:9200
   username:
   password:
 server:
@@ -14,7 +14,7 @@ server:
 spring:
   elasticsearch:
     rest:
-      uris: http://192.168.3.188:9200
+      uris: http://192.168.3.121:9200
   main:
     #bea同名类进行注册时，准许覆盖注册
     allow-bean-definition-overriding: true