Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

lift-enterprise-service/pom.xml

@@ -22,10 +22,10 @@
             <artifactId>lift-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.com.xwy</groupId>
-            <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.com.xwy</groupId>-->
+<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -43,8 +43,6 @@ public class MaintenanceOptionController {
                 new Page<>(req.getPageNum(), req.getPageSize()), new QueryWrapper<MaintenanceOption>()
                         //0L是固定数据的公司id
                         .in("mt_company_id", 0L, req.getMtCompanyId())
-                        //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
-                        .eq("status", 2)
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
                         .orderByDesc("mt_company_id")
@@ -72,8 +70,6 @@ public class MaintenanceOptionController {
                 new QueryWrapper<MaintenanceOption>()
                         //0L是固定数据的公司id
                         .in("mt_company_id", 0L, req.getMtCompanyId())
-                        //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
-                        .eq("status", 2)
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
                         .in(sort != null, "sort", sort)
@@ -92,8 +88,6 @@ public class MaintenanceOptionController {
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody MaintenanceOption option) {
-        //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
-        option.setStatus(2);
         if (optionService.save(option)) {
             return RestResponse.success(option.getId(), "成功");
         }

lift-enterprise-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-enterprise-service
   profiles:
-    active: prod
+    active: test
 
 #自动添加createTime、isDelete 等字段
 xwy:

lift-quan-service/pom.xml

@@ -16,10 +16,10 @@
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.com.xwy</groupId>
-            <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.com.xwy</groupId>-->
+<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>cn.com.ty</groupId>
             <artifactId>lift-common</artifactId>

lift-quan-service/src/main/java/cn/com/ty/lift/quan/pay/dao/entity/model/PayReq.java

@@ -2,9 +2,11 @@ package cn.com.ty.lift.quan.pay.dao.entity.model;
 
 import cn.com.ty.lift.quan.pay.dao.entity.UserInfo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class PayReq extends UserInfo {
     //金额操作记录表id

lift-quan-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-quan-service
   profiles:
-    active: prod
+    active: test
   servlet:
     multipart:
       enabled: true