Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowPerformVo.java

 package com.mortals.xhx.module.window.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.common.code.WorkmanPerformTypeEnum;
 import com.mortals.xhx.module.window.model.WindowPerformEntity;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,5 +20,6 @@ public class WindowPerformVo extends BaseEntityLong {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
-
+    private String formName = WorkmanPerformTypeEnum.市政务服务大厅窗口考核登记表.getDesc();
+    private Integer formType = WorkmanPerformTypeEnum.市政务服务大厅窗口考核登记表.getValue();
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowWorkmanPerformDetailVo.java

 package com.mortals.xhx.module.window.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.common.code.WorkmanPerformTypeEnum;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,5 +20,4 @@ public class WindowWorkmanPerformDetailVo extends BaseEntityLong {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowWorkmanPerformVo.java

 package com.mortals.xhx.module.window.model.vo;
 
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.common.code.WorkmanPerformTypeEnum;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
 import lombok.Data;
 
@@ -18,4 +19,6 @@ public class WindowWorkmanPerformVo extends BaseEntityLong {
     private List <Long> idList;
 
     private List <WindowWorkmanPerformDetailEntity> workmanPerformDetailList;
+    private String formName = WorkmanPerformTypeEnum.市政务服务大厅窗口工作人员考核汇总表.getDesc();
+    private Integer formType = WorkmanPerformTypeEnum.市政务服务大厅窗口工作人员考核汇总表.getValue();
 }
\ No newline at end of file