Merge branch 'dev' into test

epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml

@@ -167,8 +167,8 @@
 
                 <!--海康云眸-->
                 <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
-                <hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
-                <hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
+                <hik.cloud.client>111</hik.cloud.client>
+                <hik.cloud.secret>222</hik.cloud.secret>
             </properties>
         </profile>
         <profile>
@@ -222,8 +222,8 @@
 
                 <!--海康云眸-->
                 <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
-                <hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
-                <hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
+                <hik.cloud.client>111</hik.cloud.client>
+                <hik.cloud.secret>222</hik.cloud.secret>
             </properties>
         </profile>
         <profile>
@@ -281,8 +281,8 @@
 
                 <!--海康云眸-->
                 <hik.cloud.url>https://api2.hik-cloud.com</hik.cloud.url>
-                <hik.cloud.client>90688b09bb9d40088f7be404ccb347c7</hik.cloud.client>
-                <hik.cloud.secret>7b1940707a4240be9c794c5a967a30c9</hik.cloud.secret>
+                <hik.cloud.client>111</hik.cloud.client>
+                <hik.cloud.secret>222</hik.cloud.secret>
             </properties>
         </profile>
         <profile>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.10__pli_rent_update.sql

@@ -0,0 +1,3 @@
+ALTER TABLE epmet_pli_power.pli_rent_tenant_info ADD UNIT varchar(255) NULL;
+ALTER TABLE epmet_pli_power.pli_rent_contract_info ADD LESSEE_UNIT varchar(255) NULL COMMENT '承租人工作单位';
+ALTER TABLE epmet_pli_power.pli_rent_contract_info CHANGE LESSEE_UNIT LESSEE_UNIT varchar(255) NULL COMMENT '承租人工作单位' AFTER LESSEE_MOBILE;