Merge branch 'master_dev' of https://git.yunteng.com/yunteng/thingskit into master_dev

# Conflicts:
#	application/src/main/data/upgrade/thingskit/thingsKit_1.4.1_1.4.2.sql

@@ -4,4 +4,4 @@ ALTER TABLE "public"."tk_things_model"
 
 COMMENT ON COLUMN "public"."tk_things_model"."sort" IS '排序';
 -- 修改历史数据
-UPDATE tk_things_model SET sort = 1
\ No newline at end of file
+UPDATE tk_things_model SET sort = 1