Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

sop-business/src/main/resources/db/log/haoguanghui_update_log.sql

@@ -1 +1,5 @@
-
+ALTER TABLE t_b_device_delivery
+    ADD COLUMN `device_status` varchar(30) NULL COMMENT '设备状态，正常：NORMAL； 故障：FAULT' AFTER `effect`;
+
+ALTER TABLE t_b_device_delivery
+    ADD COLUMN `source_id` bigint NULL COMMENT '设备来源ID，不为空，说明该设备由其他单号中转过来' AFTER `device_status`;