Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/ProjectLiftRelevance.java

@@ -53,10 +53,6 @@ public class ProjectLiftRelevance extends BaseEntity {
      */
     private Byte isLiftLocked;
 
-    /**
-     * 是否删除 0否 1是
-     */
-    private Byte deleteFlag;
     /**
      * 首保时间
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceController.java

@@ -55,7 +55,7 @@ public class MaintenanceController {
         if (result) {
             return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
         } else {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
     }
 

lift-demo-service/src/main/java/cn/com/ty/demo/controller/TestRestController.java

@@ -36,6 +36,6 @@ public class TestRestController {
         RestResponse<BasePageResult<RoleVo>> roleVoRestResponse = portalFeignApi.queryMenuByRole(dto);
         List<RoleVo> dataList = roleVoRestResponse.getData().getRows();
         System.out.println(dataList);
-        return RestResponse.ok(env.getProperty("test.config.name"));
+        return RestResponse.success(env.getProperty("test.config.name"));
     }
 }