修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrExcelDto.java

@@ -206,40 +206,46 @@ public class OrgUsrExcelDto extends BaseDto {
     @ExcelProperty(value = "岗位资质", index = 29)
     private String postQualification;
 
+    @ApiModelProperty(value = "持证时间")
+    @ExcelProperty(value = "持证时间", index = 30)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date holdingTime;
+
     /*************************学历教育***********************/
     @ApiModelProperty(value = "第一学历")
-    @ExplicitConstraint(type = "XLLX", indexNum = 30, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "第一学历", index = 30)
+    @ExplicitConstraint(type = "XLLX", indexNum = 31, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "第一学历", index = 31)
     private String firstDegree;
 
     @ApiModelProperty(value = "最高学历")
-    @ExplicitConstraint(type = "XLLX", indexNum = 31, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "最高学历", index = 31)
+    @ExplicitConstraint(type = "XLLX", indexNum = 32, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 32)
     private String highestEducation;
 
     @ApiModelProperty(value = "学位")
-    @ExplicitConstraint(type = "XWLX", indexNum = 32, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "学位", index = 32)
+    @ExplicitConstraint(type = "XWLX", indexNum = 33, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "学位", index = 33)
     private String academicDegree;
 
     @ApiModelProperty(value = "毕业院校")
-    @ExcelProperty(value = "毕业院校", index = 33)
+    @ExcelProperty(value = "毕业院校", index = 34)
     private String school;
 
     @ApiModelProperty(value = "毕业专业名称")
-    @ExcelProperty(value = "毕业专业名称", index = 34)
+    @ExcelProperty(value = "毕业专业名称", index = 35)
     private String professionalName;
 
 
     /*************************工作履历岗***********************/
     @ApiModelProperty(value = "参加工作时间")
-    @ExcelProperty(value = "参加工作时间", index = 35)
+    @ExcelProperty(value = "参加工作时间", index = 36)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date workingHours;
 
     @ApiModelProperty(value = "参加消防部门工作时间")
-    @ExcelProperty(value = "参加消防部门工作时间", index = 36)
+    @ExcelProperty(value = "参加消防部门工作时间", index = 37)
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date fireWorkingHours;

amos-boot-system-equip/src/main/resources/application.properties

-spring.application.name=AMOS-EQUIPMANAGE-WJ
+spring.application.name=AMOS-EQUIPMANAGE-KY
 server.servlet.context-path=/equip
 server.port=8100
 #server.servlet.context-path=/case
-spring.profiles.active=dev2
+spring.profiles.active=dev
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #mybatis mapper file
 mybatis.mapper-locations=classpath:mapper/*.xml
@@ -20,7 +20,7 @@ pagehelper.support-methods-arguments=true
 spring.main.allow-bean-definition-overriding=true
 #liquibase
 spring.liquibase.change-log=classpath:/changelog/changelog-master.xml
-spring.liquibase.enabled=true
+spring.liquibase.enabled=false
 #\u5355\u4E2A\u6587\u4EF6\u6700\u5927\u5927\u5C0F
 spring.servlet.multipart.maxFileSize=100MB
 spring.servlet.multipart.maxRequestSize=100MB

amos-boot-system-jcs/src/main/resources/application-dev.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.6.60:3306/xiy_amos_jcs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_amos_common_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=root_123
+spring.datasource.password=Yeejoin@2020
 
 ## eureka properties:
-eureka.client.serviceUrl.defaultZone=http://172.16.3.97:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.11.201:10001/eureka/
 
 ## redis properties:danger/list
 spring.redis.database=1
-spring.redis.host=172.16.3.35
+spring.redis.host=172.16.11.201
 spring.redis.port=6379
-spring.redis.password=yeejoin@2020
+spring.redis.password=1234560
 
 
 ## ES properties:
-biz.elasticsearch.address=172.16.6.60
+biz.elasticsearch.address=172.16.11.201
 spring.data.elasticsearch.cluster-name=elasticsearch
 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
@@ -22,7 +22,7 @@ spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
 ## emqx properties:
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.3.35:2883
+emqx.broker=tcp://1172.16.11.201:1883
 emqx.user-name=super
 emqx.password=a123456
 
@@ -30,10 +30,10 @@ emqx.password=a123456
 rule.definition.load=false
 rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
 rule.definition.default-agency=jcs
-rule.definition.localIp=172.16.3.35
+rule.definition.localIp=172.16.11.201
 
 ## mongodb properties:
-#spring.data.mongodb.uri=mongodb://172.16.6.60:27017/command_db
+#spring.data.mongodb.uri=mongodb://172.16.11.201:27017/command_db
 
 ## file properties:
 file.url=http://39.98.45.134:9000/

amos-boot-system-jcs/src/main/resources/application.properties

@@ -34,7 +34,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 
 ##liquibase
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
-spring.liquibase.enabled= true
+spring.liquibase.enabled= false
 
 ## eureka properties:
 eureka.client.registry-fetch-interval-seconds=5