Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql

src/main/java/com/glxp/api/entity/auth/SysWorkplace.java

@@ -112,6 +112,14 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "queueStatus")
     private Integer queueStatus;
 
+    /**
+     * 是否自动采集 0:否 1:是
+     */
+    @TableField(value = "autoCollect")
+    private Integer autoCollect;
+
+
+
 
     @TableField(exist = false)
     private String invName;

src/main/resources/schemas/schema_v2.4.sql

@@ -4852,3 +4852,8 @@ CALL Pro_Temp_ColumnWork('sys_workplace_document', 'autoHandle',
                          1);
 INSERT INTO `sys_scheduled` (`id`, `cronName`, `cron`, `customerId`, `remark`)
 VALUES (158, 'ioCollectOrderFinishTask', '0 */30 * * * ?', NULL, '自动完成第三方处方单');
+
+
+CALL Pro_Temp_ColumnWork('sys_workplace', 'autoCollect',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''是否自动采集 0:否 1:是''',
+                         1);