diff --git a/iot/pom.xml b/iot/pom.xml index 26cc8b6..65fab26 100644 --- a/iot/pom.xml +++ b/iot/pom.xml @@ -9,8 +9,8 @@ com.zeto 1.0-SNAPSHOT - 11 - 1.8 + 17 + 17 UTF-8 3.0.0 @@ -40,12 +40,6 @@ tencentcloud-sdk-java 3.1.640 - - com.qcloud - cos-sts_api - 3.1.1 - compile - @@ -54,8 +48,8 @@ maven-compiler-plugin 3.1 - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.target} UTF-8 diff --git a/vue/src/pages/capital/renew/renew.vue b/vue/src/pages/capital/renew/renew.vue index c68aabc..88b399f 100644 --- a/vue/src/pages/capital/renew/renew.vue +++ b/vue/src/pages/capital/renew/renew.vue @@ -4,7 +4,7 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/vue/src/pages/machine/list/.lowcode/configs.jsx b/vue/src/pages/machine/list/.lowcode/configs.jsx index 5ffc8d8..5a3b920 100644 --- a/vue/src/pages/machine/list/.lowcode/configs.jsx +++ b/vue/src/pages/machine/list/.lowcode/configs.jsx @@ -1,7 +1,7 @@ export default { title: "设备列表", - entitys: [{"name":"id","label":"编号"},{"name":"title","label":"产品描述"},{"name":"describe","label":"描述"},{"name":"categoryId","label":"分类"},{"name":"status","label":"设备状态","code":"machineStatus"},{"name":"inline","label":"接入方式","code":"inlineMode"},{"name":"createGmt","label":"创建时间","type":"date"},{"name":"updateGmt","label":"更新时间","type":"date"}], - columns: ["id","title","describe","category_id","status","inline","create_gmt","update_gmt"], + entitys: [{"name":"id","label":"编号"},{"name":"title","label":"产品描述"},{"name":"describe","label":"描述"},{"name":"categoryId","label":"分类","type":"search","depend":"machine_category"},{"name":"status","label":"设备状态","code":"machineStatus"},{"name":"inline","label":"接入方式","code":"inlineMode"},{"name":"createGmt","label":"创建时间","type":"date"},{"name":"updateGmt","label":"更新时间","type":"date"}], + columns: ["id","title","describe","categoryId","status","inline","createGmt","updateGmt"], condition: [], slots: { header$() {