Merge pull request 'fix: 修改获取用户信息及任务包接口' (#8) from sunchenliang into test

Reviewed-on: #8

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/User.java

@@ -126,7 +126,6 @@ public class User implements BaseDto,java.io.Serializable {
 	private Long psdupdatetime;
 	@Schema(description = "用户审批节点")
 	@TableField(value="NODETYPE")
-	@JsonSerialize(using = DateSerializer.class)
 	private Integer nodeType;
 
 	//用户对应的角色信息，映射文件中对应的字段信息

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java

@@ -84,6 +84,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
                         }
                     }
                     disMapData(map);
+                    map.putAll(record);
                     record.putAll(map);
                 }
             }