修改es

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ESEquipmentCategoryDto.java

@@ -9,6 +9,8 @@ import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
+import java.util.Date;
+
 /**
  * @Author cpp
  * @Description
@@ -69,6 +71,9 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text,searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
     private String STATUS;
 
+    @Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false)
+    private Date REC_DATE;
+
 
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

@@ -329,7 +329,7 @@ public class EquipmentCategoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/viewJgAll")
 	@ApiOperation(httpMethod = "GET", value = "viewJgAll", notes = "viewJgAll")
-	public ResponseModel<Page<ESEquipmentCategoryDto>> viewJgAll( @RequestParam Map<String,Object> map) {
+	public ResponseModel<Page<JSONObject>> viewJgAll( @RequestParam Map<String,Object> map) {
 		JSONObject jsonObject = new JSONObject(map);
 		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryByKeys(jsonObject));
 	}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties

-spring.application.name=TZS-cpp
+spring.application.name=TZS
 server.servlet.context-path=/tzs
 server.port=11000
 spring.profiles.active=dev3
@@ -10,7 +10,7 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 ##liquibase
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
-spring.liquibase.enabled= false
+spring.liquibase.enabled= true