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

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AAutoNodeLogMapper.xml

@@ -23,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time ,create_user,update_time,update_user,method, execute_time,manual,zone_id,org_id,task_id, task_node_id,
+        id,create_time ,create_user,update_time,update_user,method, execute_time,manual,zone_id,org_id,task_id, task_node_id,category,
         auto_node_id, exe_status, exe_result, start_time, end_time, feedback, feedback_file, status, resourceName,instructionName,procedureName,nodeNo
     </sql>
 
@@ -31,7 +31,7 @@
         select
         <include refid="Base_Column_List"/>
         from (
-        select l.*, a.name as nodeNo, c.name as resourceName, i.name as instructionName, p.name as procedureName, z.org_id from imcs_a_auto_node_log l
+        select l.*, a.category, a.name as nodeNo, c.name as resourceName, i.name as instructionName, p.name as procedureName, z.org_id from imcs_a_auto_node_log l
         left join imcs_resource_autocode a ON l.auto_node_id = a.id
         left join imcs_t_task d ON l.task_id = d.id
         left join imcs_tenant_productionresource c ON d.resource_id = c.id

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AAutoNodeLog.java

@@ -210,6 +210,13 @@ public class AAutoNodeLog extends Entity<Long> {
     @TableField(exist = false)
     private String nodeNo;
 
+
+    /**
+     * 设备分类
+     */
+    @TableField(exist = false)
+    private String category;
+
     @TableField(exist = false)
     private String executeTime_st;
     @TableField(exist = false)