Merge branch 'develop_dl_3.7.1.1' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Car.java

@@ -249,4 +249,8 @@ public class Car extends BaseEntity {
 
 	@TableField(exist = false)
 	private String equipStatusFilter;
+
+	@ApiModelProperty(value = "使用方式")
+	private String useType;
+
 }

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

 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://172.16.10.241:3306/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.10.241:3306/dl_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -1161,4 +1161,17 @@
             DELETE FROM `wl_equipment_category` WHERE id = 759;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1694056788">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_car" columnName="use_type"/>
+            </not>
+        </preConditions>
+        <comment>新增字段 type_code</comment>
+        <sql>
+            alter table `wl_car` add column `use_type` varchar(20) DEFAULT '自购' COMMENT '使用方式';
+            UPDATE `wl_car` wc SET wc.use_type = '自购';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file