解决冲突

Edu.Aop/obj/Edu.Aop.csproj.nuget.cache

 {
   "version": 1,
-  "dgSpecHash": "u+HELPdouP/iuUhEnDHXOYtl0QGFFIbJRLsAFnhF40odnA7YrMhqntaZ7Ms0vAmpRzWbHndetBqGqKeml8sUlw==",
+  "dgSpecHash": "qS4+C/aE2XoceN0hTkUO2rE2a20F0I0FQUfhoMfxCDfFAyyJsMUEYLVmgEx4fBkBnxNb6TKbxfgm7SlDkFfeDw==",
   "success": true
 }
\ No newline at end of file

Edu.Cache/obj/Edu.Cache.csproj.nuget.cache

 {
   "version": 1,
-  "dgSpecHash": "LRybV+AX/CjAk7oiUYxps2DCWxSLeqfY8HqQiSjf/NJMOAptYharLMj2ROnTrBnXUngwsHKEa9lsxrAC3ohZ4Q==",
+  "dgSpecHash": "ONlR47WeSkOYysz4pjyhdBH0d0YMiry12R3qjWtyqabshkX8d13M0I8PfL4y/+RAh3EdKE9k1o70Xzf2RHW+ow==",
   "success": true
 }
\ No newline at end of file

Edu.Common/Config.cs

@@ -275,12 +275,28 @@ namespace Edu.Common
         }
 
 
-        public static int IsSendMsg {
+        public static int IsSendMsg
+        {
             get
             {
                 int.TryParse(ReadConfigKey("IsSendMsg"), out int _isSendMsg);
                 return _isSendMsg;
             }
         }
+        /// <summary>
+        /// 导出文件保存路径
+        /// </summary>
+        public static string FileExportPath
+        {
+            get
+            {
+                string fileExportPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "/upfile/ExportFile");
+                if (!Directory.Exists(fileExportPath))
+                {
+                    Directory.CreateDirectory(fileExportPath);
+                }
+                return fileExportPath;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Common/Enum/User/AskforleaveTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 请假类型
+    /// </summary>
+    public enum AskforleaveTypeEnum
+    {
+        /// <summary>
+        /// 年假
+        /// </summary>
+        [EnumField("年假")]
+        AnnualLeave = 1,
+        /// <summary>
+        /// 事假
+        /// </summary>
+        [EnumField("事假")]
+        AffairLeave = 2,
+        /// <summary>
+        /// 病假
+        /// </summary>
+        [EnumField("病假")]
+        SickLeave = 3,
+        /// <summary>
+        /// 调休
+        /// </summary>
+        [EnumField("调休")]
+        PaidLeave = 4,
+        /// <summary>
+        /// 产假
+        /// </summary>
+        [EnumField("产假")]
+        MaternityLeave = 5,
+        /// <summary>
+        /// 婚假
+        /// </summary>
+        [EnumField("婚假")]
+        MarriageLeave = 6,
+        /// <summary>
+        /// 例假
+        /// </summary>
+        [EnumField("例假")]
+        Period = 7,
+        /// <summary>
+        /// 丧假
+        /// </summary>
+        [EnumField("丧假")]
+        FuneralLeave = 8
+    }
+
+    /// <summary>
+    /// 等式类型 1小于  2 大于  3 等于  4小于等于  5 大于等于  6介于直接
+    /// </summary>
+    public enum EquationTypeEnum{
+        /// <summary>
+        /// 小于
+        /// </summary>
+        [EnumField("小于")]
+        LessThan = 1,
+        /// <summary>
+        /// 大于
+        /// </summary>
+        [EnumField("大于")]
+        GreaterThan = 2,
+        /// <summary>
+        /// 等于
+        /// </summary>
+        [EnumField("等于")]
+        EqualTo = 3,
+        /// <summary>
+        /// 小于等于
+        /// </summary>
+        [EnumField("小于等于")]
+        LessThanOrEqualTo = 4,
+        /// <summary>
+        /// 大于等于
+        /// </summary>
+        [EnumField("大于等于")]
+        GreaterThanOrEqualTo = 5,
+        /// <summary>
+        /// 介于之间
+        /// </summary>
+        [EnumField("介于之间")]
+        InBetween = 6
+    }
+}
\ No newline at end of file

Edu.Common/Enum/User/AttendWayTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 考勤打卡方式
+    /// </summary>
+    public enum AttendWayTypeEnum
+    {
+        /// <summary>
+        /// 地址打卡
+        /// </summary>
+        [EnumField("Address")]
+        Address = 1,
+        /// <summary>
+        /// Wifi打卡
+        /// </summary>
+        [EnumField("Wifi")]
+        Wifi = 2,
+    }
+}
\ No newline at end of file

Edu.Common/Enum/User/AttendanceEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    ///0 缺卡 1正常 2 迟到  3外勤  4出差  5请假  6补卡 
+    public enum AttendanceEnum
+    {
+        /// <summary>
+        /// 缺卡
+        /// </summary>
+        [EnumField("缺卡")]
+        QK = 0,
+        /// <summary>
+        /// 正常
+        /// </summary>
+        [EnumField("正常")]
+        ZC = 1,
+        /// <summary>
+        /// 迟到
+        /// </summary>
+        [EnumField("迟到")]
+        CD = 2,
+        /// <summary>
+        /// 外勤
+        /// </summary>
+        [EnumField("外勤")]
+        WQ = 3,
+        /// <summary>
+        /// 出差
+        /// </summary>
+        [EnumField("出差")]
+        CC = 4,
+        /// <summary>
+        /// 请假
+        /// </summary>
+        [EnumField("请假")]
+        QJ = 5,
+        /// <summary>
+        /// 补卡
+        /// </summary>
+        [EnumField("补卡")]
+        BK = 6
+    }
+}
\ No newline at end of file

Edu.Common/Enum/User/NoticeRuleEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 公告编码规则类型
+    /// </summary>
+    public enum NoticeRuleEnum
+    {
+        /// <summary>
+        /// yyyy-[a-z]-[001-999]
+        /// </summary>
+        [EnumField("yyyy-[a-z]-[001-999]")]
+        One = 1,
+    }
+}

Edu.Common/Enum/User/NoticeStateEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 公告状态类型
+    /// </summary>
+    public enum NoticeStateEnum
+    {
+        /// <summary>
+        /// 发布
+        /// </summary>
+        [EnumField("发布")]
+        Publish = 1,
+        /// <summary>
+        /// 草稿
+        /// </summary>
+        [EnumField("草稿")]
+        Draft = 2,
+        /// <summary>
+        /// 撤回
+        /// </summary>
+        [EnumField("撤回")]
+        Cancel = 3,
+    }
+}

Edu.Common/Enum/User/SystemPushLogTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 0、所有平台 1、小满APP（包含IOS和Android）2、Web3、微信公众号4、微信小程序
+    /// </summary>
+    public enum SystemPushLogTypeEnum
+    {
+        /// <summary>
+        /// 小满APP（包含IOS和Android）
+        /// </summary>
+        [EnumField("小满APP（包含IOS和Android")]
+        XMApp = 1,
+
+        /// <summary>
+        /// Web
+        /// </summary>
+        [EnumField("、Web")]
+        Web = 2,
+
+        /// <summary>
+        /// 、微信公众号
+        /// </summary>
+        [EnumField("、微信公众号")]
+        OfficialAccount = 3,
+
+        /// <summary>
+        /// 微信小程序
+        /// </summary>
+        [EnumField("微信小程序")]
+        Applet = 4
+    }
+    /// <summary>
+    /// 推送类型
+    /// </summary>
+    public enum SysTemPushTypeEnum
+    {
+        /// <summary>
+        /// 审批
+        /// </summary>
+        [EnumField("审批")]
+        Audit = 1,
+        /// <summary>
+        /// 通知
+        /// </summary>
+        [EnumField("通知")]
+        notification = 2,
+        /// <summary>
+        /// 订单
+        /// </summary>
+        [EnumField("订单")]
+        Order = 3,
+        /// <summary>
+        /// 旅客名单
+        /// </summary>
+        [EnumField("旅客名单")]
+        Guest = 4,
+        /// <summary>
+        /// 财务单据催审
+        /// </summary>
+        [EnumField("财务单据催审")]
+        FinancePushOn=5,
+        /// <summary>
+        /// 营销通知
+        /// </summary>
+        [EnumField("营销通知")]
+        Marketing = 6,
+        /// <summary>
+        /// 资产审批
+        /// </summary>
+        [EnumField("资产审批")]
+        Property = 7,
+        /// <summary>
+        /// 工作计划审批
+        /// </summary>
+        [EnumField("工作计划审批")]
+        Work = 8,
+    }
+}
\ No newline at end of file

Edu.Common/Enum/User/TravelVehicleEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 行程交通工具
+    /// </summary>
+    public enum TravelVehicleEnum
+    {
+        /// <summary>
+        /// 飞机
+        /// </summary>
+        [EnumField("飞机")]
+        Plane = 1,
+        /// <summary>
+        /// 火车 
+        /// </summary>
+        [EnumField("火车")]
+        Train = 2,
+        /// <summary>
+        /// 汽车 
+        /// </summary>
+        [EnumField("汽车")]
+        Car = 3,
+        /// <summary>
+        /// 其它
+        /// </summary>
+        [EnumField("其它")]
+        Other = 4
+    }
+}

Edu.Common/Enum/User/TravelVehicleTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 行程交通工具单程往返
+    /// </summary>
+    public enum TravelVehicleTypeEnum
+    {
+        /// <summary>
+        /// 单程
+        /// </summary>
+        [EnumField("单程")]
+        OneWay = 1,
+        /// <summary>
+        /// 往返 
+        /// </summary>
+        [EnumField("往返")]
+        BackForth = 2
+    }
+}

Edu.Common/Enum/User/WFAuditStatus.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    #region OA
+    /// <summary>
+    /// 工作申请流审核状态
+    /// </summary>
+    public enum WFAuditStatus
+    {
+        /// <summary>
+        /// 审核中
+        /// </summary>
+        [EnumField("审核中")]
+        InReview = 1,
+        /// <summary>
+        /// 撤回 
+        /// </summary>
+        [EnumField("撤回")]
+        ToWithdraw = 2,
+        /// <summary>
+        /// 驳回 
+        /// </summary>
+        [EnumField("驳回")]
+        Rejected = 3,
+        /// <summary>
+        /// 不通过
+        /// </summary>
+        [EnumField("不通过")]
+        NotThrough = 4,
+        /// <summary>
+        /// 通过
+        /// </summary>
+        [EnumField("通过")]
+        Through = 5
+    }
+    /// <summary>
+    /// 流程审核状态
+    /// </summary>
+    public enum WFRrocessStatus
+    {
+        /// <summary>
+        /// 未审核
+        /// </summary>
+        [EnumField("未审核")]
+        NotAudit = 1,
+        /// <summary>
+        /// 通过
+        /// </summary>
+        [EnumField("审核通过")]
+        AuditThrough = 2,
+        /// <summary>
+        /// 不通过
+        /// </summary>
+        [EnumField("审核不通过")]
+        AuditNotThrough = 3,
+        /// <summary>
+        /// 驳回 
+        /// </summary>
+        [EnumField("驳回")]
+        Rejected = 4,
+        /// <summary>
+        /// 他人已审核（仅限审核记录表） 
+        /// </summary>
+        [EnumField("他人已审核")]
+        OtherHaveAudit = 5
+
+    }
+
+    /// <summary>
+    /// app筛选审核状态枚举
+    /// </summary>
+    public enum AppAuditStatusEnum
+    {
+        /// <summary>
+        /// 全部
+        /// </summary>
+        [EnumField("全部")]
+        All = 0,
+        /// <summary>
+        /// 审批完成 
+        /// </summary>
+        [EnumField("审批完成")]
+        AuditComplete = 1,
+        /// <summary>
+        /// 审批中 
+        /// </summary>
+        [EnumField("审批中")]
+        InComplete = 2,
+        /// <summary>
+        /// 已撤销
+        /// </summary>
+        [EnumField("已撤销")]
+        ToWithdraw = 3
+    }
+    /// <summary>
+    /// 申请单撤回状态
+    /// </summary>
+    public enum WFAuditCancelStatus
+    {
+        /// <summary>
+        /// 正常
+        /// </summary>
+        [EnumField("正常")]
+        Normal = 1,
+        /// <summary>
+        /// 撤回
+        /// </summary>
+        [EnumField("撤回")]
+        Cancel = 2
+    }
+    #endregion
+    #region 财务
+    /// <summary>
+    /// 财务审核状态
+    /// </summary>
+    public enum FinanceAuditStatus
+    {
+        /// <summary>
+        /// 暂存
+        /// </summary>
+        [EnumField("制单人暂存")]
+        Temporary = 0,
+        /// <summary>
+        /// 审核中
+        /// </summary>
+        [EnumField("审核中")]
+        InReview = 1,
+        /// <summary>
+        /// 通过 
+        /// </summary>
+        [EnumField("通过")]
+        Pass = 2,
+        /// <summary>
+        /// 驳回 
+        /// </summary>
+        [EnumField("驳回")]
+        Rejected = 3,
+        /// <summary>
+        /// 作废
+        /// </summary>
+        [EnumField("作废")]
+        Delete = 4,
+        /// <summary>
+        /// 出纳暂存
+        /// </summary>
+        [EnumField("出纳暂存")]
+        CTemporary = 5
+    }
+    #endregion
+}

Edu.Common/Enum/User/WFTAuditTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 审核人类型
+    /// </summary>
+    public enum WFTAuditTypeEnum
+    {
+        /// <summary>
+        /// 主管
+        /// </summary>
+        [EnumField("主管")]
+        Director = 1,
+        /// <summary>
+        /// 指定成员
+        /// </summary>
+        [EnumField("指定成员")]
+        SpecifiedMember = 2,
+        /// <summary>
+        /// 角色
+        /// </summary>
+        [EnumField("角色")]
+        Role = 3
+    }
+    /// <summary>
+    /// 审核方式
+    /// </summary>
+    public enum WFTAuditWayEnum
+    {
+        /// <summary>
+        /// 标准
+        /// </summary>
+        [EnumField("标准")]
+        Successively = 1,
+        /// <summary>
+        /// 会签
+        /// </summary>
+        [EnumField("会签")]
+        Countersign = 2,
+        /// <summary>
+        /// 或签
+        /// </summary>
+        [EnumField("或签")]
+        OrSign = 3
+    }
+    /// <summary>
+    /// 财务节点
+    /// </summary>
+    public enum FinanceAuditTypeEnum
+    {
+        /// <summary>
+        /// 主管
+        /// </summary>
+        [EnumField("主管")]
+        Director = 1,
+        /// <summary>
+        /// 指定成员
+        /// </summary>
+        [EnumField("指定成员")]
+        SpecifiedMember = 2,
+        /// <summary>
+        /// 角色
+        /// </summary>
+        [EnumField("角色")]
+        Role = 3,
+        /// <summary>
+        /// 空节点
+        /// </summary>
+        [EnumField("空节点")]
+        Empty = 4,
+        /// <summary>
+        /// 出纳窗口
+        /// </summary>
+        [EnumField("出纳窗口")]
+        Cashier = 5,
+        /// <summary>
+        /// 会计窗口
+        /// </summary>
+        [EnumField("会计窗口")]
+        Account = 6,
+        /// <summary>
+        /// 线控
+        /// </summary>
+        [EnumField("线控")]
+        OP = 7,
+        /// <summary>
+        /// 记账出纳
+        /// </summary>
+        [EnumField("记账出纳")]
+        Incharge = 8,
+        /// <summary>
+        /// 收款出纳
+        /// </summary>
+        [EnumField("收款出纳")]
+        BackCashier = 9,
+        /// <summary>
+        /// 分公司OP
+        /// </summary>
+        [EnumField("分公司OP")]
+        BranchOP = 10,
+        /// <summary>
+        /// 总部OP
+        /// </summary>
+        [EnumField("总部OP")]
+        HQOP = 11,
+    }
+}

Edu.Common/Enum/User/WFTGroupTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 工作流模板分组类型
+    /// </summary>
+    public enum WFTGroupTypeEnum
+    {
+        /// <summary>
+        /// 出勤休假
+        /// </summary>
+        [EnumField("出勤休假")]
+        Attendance = 1
+    }
+}

Edu.Common/Enum/User/WFTTemplateTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 工作流模板模板类别分组类型
+    /// EnumField("名称|图标|分组类型|获取模板命令|表单提交命令")
+    /// </summary>
+    public enum WFTTemplateTypeEnum
+    {
+        /// <summary>
+        /// 请假
+        /// </summary>
+        [EnumField("请假|/Upload/Icon/Audit/qingjia.png|1|app_user_workflow_askforleave_template|app_user_workflow_askforleave_submit")]
+        AskForLeave = 1,
+        /// <summary>
+        /// 出差
+        /// </summary>
+        [EnumField("出差|/Upload/Icon/Audit/chucai.png|1|app_user_workflow_evection_template|app_user_workflow_evection_submit")]
+        Evection = 2,
+        /// <summary>
+        /// 外出
+        /// </summary>
+        [EnumField("外出|/Upload/Icon/Audit/waichu.png|1|app_user_workflow_goout_template|app_user_workflow_goout_submit")]
+        Goout = 3,
+        /// <summary>
+        /// 补卡
+        /// </summary>
+        [EnumField("补卡|/Upload/Icon/Audit/buka.png|1|app_user_workflow_reissueCard_template|app_user_workflow_reissueCard_submit")]
+        ReissueCard = 4,
+    }
+}

Edu.Common/Enum/User/WFTempTypeEnum.cs

+using Edu.Common.Plugin;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 流程模板类型
+    /// </summary>
+    public enum WFTempTypeEnum
+    {
+        /// <summary>
+        /// OA
+        /// </summary>
+        [EnumField("OA")]
+        OA = 1,
+        /// <summary>
+        /// 财务
+        /// </summary>
+        [EnumField("财务")]
+        Finance = 2,
+    }
+}

Edu.Common/Plugin/ConvertHelper.cs

@@ -25,11 +25,54 @@ namespace Edu.Common
                 try
                 {
                     timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd HH:mm:ss");
-                   
                 }
                 catch
-                { 
-                
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
+        /// <summary>
+        /// 获取时间格式
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatTimeStr(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("HH:mm");
+                }
+                catch
+                {
+
+                }
+            }
+            return timeStr;
+        }
+
+        /// <summary>
+        /// 获取时间格式
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        public static string FormatMonthDay(this object time)
+        {
+            string timeStr = "";
+            if (time != null)
+            {
+                try
+                {
+                    timeStr = Convert.ToDateTime(time.ToString()).ToString("MM-dd");
+                }
+                catch
+                {
+
                 }
             }
             return timeStr;
@@ -69,7 +112,7 @@ namespace Edu.Common
         public static List<int> StringToList(object value)
         {
             List<int> list = new List<int>();
-            if (value!=null && !string.IsNullOrEmpty(value.ToString()))
+            if (value != null && !string.IsNullOrEmpty(value.ToString()))
             {
                 var tempArray = value.ToString().Split(',');
                 if (tempArray != null && tempArray.Length > 0)
@@ -111,5 +154,38 @@ namespace Edu.Common
             }
             return list;
         }
+
+        /// <summary>
+        /// 根据日期获取星期几
+        /// </summary>
+        /// <param name="date">日期</param>
+        /// <returns></returns>
+        public static string GetWeekDay(this object date)
+        {
+            string weekDay = "";
+            if (date != null)
+            {
+                try
+                {
+                    var dateTime = Convert.ToDateTime(date.ToString());
+                    string strWeek = dateTime.DayOfWeek.ToString();
+                    switch (strWeek)
+                    {
+                        case "Monday": weekDay = "星期一"; break;
+                        case "Tuesday": weekDay = "星期二"; break;
+                        case "Wednesday": weekDay = "星期三"; break;
+                        case "Thursday": weekDay = "星期四"; break;
+                        case "Friday": weekDay = "星期五"; break;
+                        case "Saturday": weekDay = "星期六"; break;
+                        case "Sunday": weekDay = "星期天"; break;
+                    }
+                }
+                catch
+                {
+
+                }
+            }
+            return weekDay;
+        }
     }
 }
\ No newline at end of file

Edu.Common/Plugin/HtmlHelper.cs

 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Edu.Common.Plugin
 {
@@ -48,12 +45,10 @@ namespace Edu.Common.Plugin
         {
             // 定义正则表达式用来匹配 img 标签 
             Regex regImg = new Regex(@"<img\b[^<>]*?\bsrc[\s\t\r\n]*=[\s\t\r\n]*[""']?[\s\t\r\n]*(?<imgUrl>[^\s\t\r\n""'<>]*)[^<>]*?[\s\t\r\n]*>", RegexOptions.IgnoreCase);
-
             // 搜索匹配的字符串 
             MatchCollection matches = regImg.Matches(sHtmlText);
             int i = 0;
             string[] sUrlList = new string[matches.Count];
-
             // 取得匹配项列表 
             foreach (Match match in matches)
                 sUrlList[i++] = match.Groups["imgUrl"].Value;
@@ -160,7 +155,6 @@ namespace Edu.Common.Plugin
         /// <returns></returns>  
         public static void GetImgParm(string imgUrl,  out int width, out int height)
         {
-
             Regex regWidth = new Regex(@"width=(?<width>\d+)", RegexOptions.IgnoreCase);
             MatchCollection mcWidth = regWidth.Matches(imgUrl);
             if (mcWidth.Count > 0)

Edu.Common/Plugin/ReflectionMapperHelper.cs

+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Edu.Common.Plugin
+{
+    /// <summary>
+    /// 反射映射
+    /// </summary>
+    public static class ReflectionMapperHelper
+    {
+        /// <summary>
+        /// 类型映射
+        /// </summary>
+        /// <typeparam name="TOut">转换目标</typeparam>
+        /// <param name="source">目标源</param>
+        /// <returns></returns>
+        public static TOut RefMapperTo<TOut>(this object source)
+        {
+            if (source == null)
+            {
+                return default(TOut);
+            }
+            else
+            {
+                Type sourceType = source.GetType();
+                TOut tOut = Activator.CreateInstance<TOut>();
+                Type outType = tOut.GetType();
+                foreach (var itemOut in outType.GetProperties())
+                {
+                    foreach (var itemIn in sourceType.GetProperties())
+                    {
+                        if (itemOut.Name.ToLower().Equals(itemIn.Name.ToLower()) && itemOut.PropertyType == itemIn.PropertyType)
+                        {
+                            itemOut.SetValue(tOut, itemIn.GetValue(source));
+                            break;
+                        }
+                    }
+                }
+                foreach (var itemOut in outType.GetFields())
+                {
+                    foreach (var itemIn in sourceType.GetFields())
+                    {
+                        if (itemOut.Name.ToLower().Equals(itemIn.Name.ToLower()) && itemOut.FieldType == itemIn.FieldType)
+                        {
+                            itemOut.SetValue(tOut, itemIn.GetValue(source));
+                            break;
+                        }
+                    }
+                }
+                return tOut;
+            }
+        }
+
+        /// <summary>
+        /// 集合列表类型映射
+        /// </summary>
+        /// <typeparam name="TOut">转换目标</typeparam>
+        /// <param name="sourceList">目标源</param>
+        /// <returns></returns>
+        public static List<TOut> RefMapperToList<TOut>(this IEnumerable sourceList)
+        {
+            List<TOut> outList = new List<TOut>();
+            foreach (var source in sourceList)
+            {
+                Type sourceType = source.GetType();
+                TOut tOut = Activator.CreateInstance<TOut>();
+                Type outType = tOut.GetType();
+                foreach (var itemOut in outType.GetProperties())
+                {
+                    foreach (var itemIn in sourceType.GetProperties())
+                    {
+                        if (itemOut.Name.ToLower().Equals(itemIn.Name.ToLower()) && itemOut.PropertyType == itemIn.PropertyType)
+                        {
+                            itemOut.SetValue(tOut, itemIn.GetValue(source));
+                            break;
+                        }
+                    }
+                }
+                foreach (var itemOut in outType.GetFields())
+                {
+                    foreach (var itemIn in sourceType.GetFields())
+                    {
+                        if (itemOut.Name.ToLower().Equals(itemIn.Name.ToLower()) && itemOut.FieldType == itemIn.FieldType)
+                        {
+                            itemOut.SetValue(tOut, itemIn.GetValue(source));
+                            break;
+                        }
+                    }
+                }
+                outList.Add(tOut);
+            }
+
+            return outList;
+        }
+    }
+}

Edu.Common/obj/Edu.Common.csproj.nuget.cache

 {
   "version": 1,
-  "dgSpecHash": "X7SajWCwLU6mAlXKgO5nvDq5p1Pwn0s7q39A1pQTJTUgHEdfuhxwAgxLpUYjun5FN4oKDsF6E8+F3Ug2asm/cA==",
+  "dgSpecHash": "sAdDtYFTx/0Rvguc5xEk8IS0ZWS5/MK/BUrU6Bc5+X0Jpwn507VwhFPFDPUEtU3suGdqunh5MNeh7ljbI1LoIw==",
   "success": true
 }
\ No newline at end of file

Edu.Model/Entity/Log/RB_User_ChangeLog.cs

+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Log
+{
+    /// <summary>
+    /// 用户信息修改记录实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_User_ChangeLog
+    {
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 日志内容
+		/// </summary>
+		public string LogContent { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 校区编号
+		/// </summary>
+		public int School_Id { get; set; }
+	}
+}

Edu.Model/Entity/User/RB_Account.cs

@@ -71,5 +71,11 @@ namespace Edu.Model.Entity.User
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
-	}
+
+        /// <summary>
+        /// 年假天数
+        /// </summary>
+        public double AnnualLeaveDay { get; set; }
+
+    }
 }

Edu.Model/Entity/User/RB_Attendance.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 考勤实体类
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Attendance
+    {
+
+        /// <summary>
+        /// 主键编号
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团id
+        /// </summary>        
+        public int RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 公司id
+        /// </summary>        
+        public int RB_BranchId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建人
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 更新人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 更新时间
+        /// </summary>        
+        public DateTime UpdateTime
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/RB_Attendance_LeaveTime.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// rb_attendance Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Attendance_LeaveTime
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 请假人
+        /// </summary>        
+        public int? EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 请假月份
+        /// </summary>        
+        public string AskforleaveMonth
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 时长
+        /// </summary>        
+        public double? Duration
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 请假类型 (1 年假 2 事假 3 病假 4 调休 5 产假 6 婚假 7 例假 8 丧假)
+        /// </summary>        
+        public int? AskforleaveType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 历史添加时长
+        /// </summary>        
+        public string History
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/RB_Attendance_Record.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 考勤记录实体类
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Attendance_Record
+    {
+
+        /// <summary>
+        /// 主键编号
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 员工id
+        /// </summary>        
+        public int EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡地址
+        /// </summary>        
+        public string BeOnAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡地图坐标
+        /// </summary>        
+        public string BeOnTargetAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡时间
+        /// </summary>        
+        public DateTime? BeOnDutyTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡时间
+        /// </summary>        
+        public DateTime? OffDutyTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 0 缺卡 1正常 2 迟到  3外勤  4出差  5请假  6 补卡 
+        /// </summary>        
+        public AttendanceEnum BeOnStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 0 缺卡 1正常 2 迟到  3外勤  4出差  5请假  6 补卡 
+        /// </summary>        
+        public AttendanceEnum OffStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡类型 1 地点  2  wifi
+        /// </summary>        
+        public int? BeOnType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 当天日期
+        /// </summary>        
+        public DateTime Date
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 迟到时间
+        /// </summary>        
+        public int? BeLateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 手机唯一标识码
+        /// </summary>        
+        public string PhoneId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡地址
+        /// </summary>        
+        public string OffAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡地图坐标
+        /// </summary>        
+        public string OffTargetAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡类型 1 地点  2  wifi
+        /// </summary>        
+        public int? OffType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡验证地址名称
+        /// </summary>        
+        public string BeOnVerifyAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡验证地址名称
+        /// </summary>        
+        public string OffVerifyAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班时间
+        /// </summary>        
+        public string BeOnTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班时间
+        /// </summary>        
+        public string OffTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 历史记录
+        /// </summary>
+        public string History { get; set; }
+        /// <summary>
+        /// 手机名称
+        /// </summary>
+        public string PhoneName { get; set; }
+        /// <summary>
+        /// 上班关联审核
+        /// </summary>
+        public int? BeOnRelevance { get; set; }
+        /// <summary>
+        /// 上班关联审核类型1请假  2出差  3  外出  4  补卡
+        /// </summary>
+        public int? BeOnRelevanceType { get; set; }
+        /// <summary>
+        /// 下班关联审核
+        /// </summary>
+        public int? OffRelevance { get; set; }
+        /// <summary>
+        /// 下班关联审核类型1请假  2出差  3  外出  4  补卡
+        /// </summary>
+        public int? OffRelevanceType { get; set; }
+    }
+}

Edu.Model/Entity/User/RB_Attendance_Way.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_attendance_way Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Attendance_Way
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 考勤管理id
+        /// </summary>        
+        public int Attendance_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型1 地址 2 wifi
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 地址
+        /// </summary>        
+        public string Address
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 地图坐标/MAC地址
+        /// </summary>        
+        public string TargetAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 范围
+        /// </summary>        
+        public int? Scope
+        {
+            get;
+            set;
+        }
+    }
+}

Edu.Model/Entity/User/RB_Department.cs

@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.User
 		/// 部门排序
 		/// </summary>
 		public int DeptSort { get; set; }
+
+		/// <summary>
+		/// 是否为公司(1-是)
+		/// </summary>
+		public int IsCompany { get; set; }
 	}
 }

Edu.Model/Entity/User/RB_Dictvalue.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 字典表
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Dictvalue
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>       
+        public int ID
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标识
+        /// </summary>        
+        public string DictKey
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int SNO
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 代码
+        /// </summary>   
+        public string Code
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 内容
+        /// </summary>   
+        public string Content
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>        
+        public int? RB_Group_id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 公司id
+        /// </summary>        
+        public int? RB_Branch_id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 操作人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>        
+        public DateTime UpdateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public DateStateEnum Status
+        {
+            get;
+            set;
+        }
+    }
+}

Edu.Model/Entity/User/RB_Manager.cs

@@ -67,7 +67,6 @@ namespace Edu.Model.Entity.User
 		/// </summary>
 		public DateStateEnum Status { get; set; }
 
-
 		/// <summary>
 		/// 部门编号
 		/// </summary>

Edu.Model/Entity/User/RB_Notice.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 公告实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Notice
+    {
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 来源
+		/// </summary>
+		public string From { get; set; }
+
+        /// <summary>
+		/// 发送
+		/// </summary>
+		public string To { get; set; }
+
+        /// <summary>
+        /// 抄送人
+        /// </summary>
+        public string CopyPeople { get; set; }
+
+        /// <summary>
+        /// 编号  
+        /// </summary>
+        public string Number { get; set; }
+        /// <summary>
+        /// 编码规则  枚举
+        /// </summary>
+        public NoticeRuleEnum NumberRule { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 富文本内容
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 附件  json格式 
+        /// </summary>
+        public string File { get; set; }
+
+        /// <summary>
+        /// 公告状态
+        /// </summary>
+        public NoticeStateEnum NoticeState { get; set; }
+
+        /// <summary>
+        /// 是否置顶  1是  2否
+        /// </summary>
+        public int Is_Top { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime? CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 修改时间
+		/// </summary>
+		public DateTime? UpdateTime { get; set; }
+	}
+}

Edu.Model/Entity/User/RB_Notice_Base.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 公告基本配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Notice_Base
+    {
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 抬头图片
+		/// </summary>
+		public string Image { get; set; }
+
+		/// <summary>
+		/// 来源
+		/// </summary>
+		public string From { get; set; }
+
+        /// <summary>
+        /// 抄送人
+        /// </summary>
+        public string CopyPeople { get; set; }
+
+        /// <summary>
+        /// 编号规则  枚举 
+        /// </summary>
+        public NoticeRuleEnum NumberRule { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime? CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 修改时间
+		/// </summary>
+		public DateTime? UpdateTime { get; set; }
+	}
+}

Edu.Model/Entity/User/RB_Notice_Read.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// 公告阅读实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Notice_Read
+    {
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 公告id
+		/// </summary>
+		public int NoticeId { get; set; }
+
+		/// <summary>
+		/// 账号id
+		/// </summary>
+		public int AccountId { get; set; }
+
+        /// <summary>
+        /// 阅读时间
+        /// </summary>
+        public DateTime? ReadTime { get; set; }
+	}
+}

Edu.Model/Entity/User/RB_Technicaldates.cs

+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+    /// <summary>
+    /// rb_technicaldates Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Technicaldates
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// AttendanceId
+        /// </summary>        
+        public int AttendanceId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 日期
+        /// </summary>        
+        public DateTime Date
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型1打卡2不打卡
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡时间
+        /// </summary>        
+        public string BeOnDutyTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡时间
+        /// </summary>        
+        public string OffDutyTime
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 部门编号
+        /// </summary>        
+        public int RB_Department_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+          /// 主键:员工编号
+          /// </summary>        
+        public int EmployeeId
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/RB_WorkdaySeting.cs

+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workdayseting Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_WorkdaySeting
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 考勤管理id
+        /// </summary>        
+        public int AttendanceId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 周几  存  周一  周二  周三。。。
+        /// </summary>        
+        public string Workday
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 上班打卡时间
+        /// </summary>        
+        public string BeOnDutyTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 下班打卡时间  05:44
+        /// </summary>        
+        public string OffDutyTime
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Askforleave.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+	/// rb_workflow_askforleave:实体类(属性说明自动提取数据库字段的描述信息)
+	/// </summary>
+	[Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Askforleave
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 请假类型 (1 年假 2 事假 3 病假 4 调休 5 产假 6 婚假 7 例假 8 丧假)
+        /// </summary>  
+        public AskforleaveTypeEnum? AskforleaveType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开始时间
+        /// </summary> 
+        public DateTime? StartTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 结束时间
+        /// </summary        
+        public DateTime? EndTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 时长
+        /// </summary> 
+        public double? Duration
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 请假事由
+        /// </summary>      
+        public string Description
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 数据库图片
+        /// </summary>        
+        public string Image
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
+        /// </summary>        
+        public WFAuditStatus? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属模版id
+        /// </summary>        
+        public int? TemplateId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateBy
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateTime
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateBy
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团
+        /// </summary>        
+        public int? RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属公司
+        /// </summary>        
+        public int? RB_BranchId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流条件表id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否是撤销流程   1正常  2 撤销
+        /// </summary>
+        public WFAuditCancelStatus? IsCancel { get; set; }
+        /// <summary>
+        /// 午休时长
+        /// </summary>
+        public string LunchTime { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Audit.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_audit Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Audit
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审批条件id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核人类型  1主管(指定一级) 2 指定成员  3角色
+        /// </summary>        
+        public int? AuditType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1依次审批（本环节内审批人依次审批） 2 会签（须所有审批人同意）3 或签（一名审批人同意或拒绝即可）
+        /// </summary>        
+        public int? AuditWay
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 存发起人或者角色   发起人1 表示直属主管   2表示再上一级   依次类推
+        /// </summary>        
+        public int? RoleOrInitiator
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 步骤（排序）
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 审核人描述
+        /// </summary>
+        public string AuditDescription { get; set; }
+        /// <summary>
+        /// 0常规1-特殊节点
+        /// </summary>
+        public int? SpecialNode { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_AuditRelevance.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+	/// Rb_Workflow_AuditRelevance:实体类(属性说明自动提取数据库字段的描述信息)
+	/// </summary>
+	[Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_AuditRelevance
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审批条件id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核人类型  1主管(指定一级) 2 指定成员  3角色
+        /// </summary>        
+        public WFTAuditTypeEnum? AuditType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1依次审批（本环节内审批人依次审批） 2 会签（须所有审批人同意）3或签（一名审批人同意或拒绝即可）
+        /// </summary>        
+        public WFTAuditWayEnum? AuditWay
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 存发起人或者岗位部门关联表id   发起人1 表示直属主管   2表示再上一级   依次类推
+        /// </summary>        
+        public int? RoleOrInitiator
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 步骤（排序）
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// AuditDescription
+        /// </summary>        
+        public string AuditDescription
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否特殊节点0-常规1-出纳收款2-出纳付款
+        /// </summary>
+        public int? SpecialNode
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 工作流id
+        /// </summary>        
+        public int? WorkFlowId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1请假  2出差  3  外出  4  补卡
+        /// </summary>        
+        public WFTTemplateTypeEnum? TemplateType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原审核id
+        /// </summary>        
+        public int? OriginalAuditId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1未审核  2审核通过  3 不通过  4 驳回
+        /// </summary>        
+        public WFRrocessStatus? Stauts
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 待审核人  1,2,3 以逗号分隔
+        /// </summary>
+        public string ToAuditId { get; set; }
+        /// <summary>
+        /// 已审核人   1,2,3  以逗号分割
+        /// </summary>
+        public string AuditedId { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_AuditUserRelevance.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+	/// rb_workflow_askforleave:实体类(属性说明自动提取数据库字段的描述信息)
+	/// </summary>
+	[Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_AuditUserRelevance
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核关联id
+        /// </summary>        
+        public int? AuditRelevanceId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 员工id
+        /// </summary>        
+        public int? EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序（表示依次审批）
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Auditrecord.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_auditrecord Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Auditrecord
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流id
+        /// </summary>        
+        public int? WorkFlowId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核id
+        /// </summary>        
+        public int? AuditId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1未审核  2审核通过  3 不通过  4 驳回 5他人已审核
+        /// </summary>        
+        public WFRrocessStatus? AuditStatus
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 描述
+        /// </summary>        
+        public string Description
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1请假  2出差  3  外出  4  补卡
+        /// </summary>        
+        public WFTTemplateTypeEnum? TemplateType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateBy
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateTime
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateBy
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审批人
+        /// </summary>        
+        public int? AuditEmId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 转交备注
+        /// </summary>
+        public string CareOfRemarks { get; set; }
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string Image { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Audituser.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_audituser Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Audituser
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 审核id
+        /// </summary>        
+        public int? AuditId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 员工id
+        /// </summary>        
+        public int? EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1 指定成员审核人  2 抄送人
+        /// </summary>        
+        public int? EmType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序（表示依次审批）
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Condition.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_condition Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Condition
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 模版id
+        /// </summary>        
+        public int? TemplateId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 请假类型 (1 年假 2 事假 3 病假 4 调休 5 产假 6 婚假 7 例假 8 丧假) json格式 [1,2,3]
+        /// </summary>        
+        public string AskforleaveType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1天数  2 小时
+        /// </summary>        
+        public int? DayHour
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1小于  2 大于  3 等于  4小于等于  5 大于等于  6介于直接
+        /// </summary>        
+        public int? ConditionType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开始值
+        /// </summary>        
+        public double? StartValue
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1大于   2大于等于
+        /// </summary>        
+        public int? StartType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 结束值
+        /// </summary>        
+        public double? EndValue
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1小于  2小于等于
+        /// </summary>        
+        public int? EndType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// (优先级)排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_CopyToPeople.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// Rb_Workflow_CopyToPeople Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_CopyToPeople
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 员工id
+        /// </summary>        
+        public int? EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流id
+        /// </summary>        
+        public int? WorkFlowId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1请假  2出差  3  外出  4  补卡
+        /// </summary>        
+        public WFTTemplateTypeEnum? TemplateType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1未审核  2已审核
+        /// </summary>        
+        public WFRrocessStatus? Stauts
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1未读  2已读
+        /// </summary>        
+        public int? ReadStauts
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Evection.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_evection Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Evection
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 出差事由
+        /// </summary>
+        public string Description
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 出差天数
+        /// </summary> 
+        public double? Traveldays
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 出差备注
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
+        /// </summary>        
+        public WFAuditStatus? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属模版id
+        /// </summary>        
+        public int? TemplateId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateBy
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateTime
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateBy
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团
+        /// </summary>        
+        public int? RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属公司
+        /// </summary>        
+        public int? RB_BranchId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流条件表id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否是撤销流程   1正常  2 撤销
+        /// </summary>
+        public WFAuditCancelStatus? IsCancel { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_GoOut.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_goout Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_GoOut
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开始时间
+        /// </summary>   
+        public DateTime? StartTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 结束时间
+        /// </summary>     
+        public DateTime? EndTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 时长
+        /// </summary>    
+        public double? Duration
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 外出事由
+        /// </summary>    
+        public string Description
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 图片
+        /// </summary>        
+        public string Image
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
+        /// </summary>        
+        public WFAuditStatus? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateBy
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateTime
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateBy
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团
+        /// </summary>        
+        public int? RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属公司
+        /// </summary>        
+        public int? RB_BranchId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属模版id
+        /// </summary>        
+        public int? TemplateId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流条件表id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否是撤销流程   1正常  2 撤销
+        /// </summary>
+        public WFAuditCancelStatus? IsCancel { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Reissuecard.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_reissuecard Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Reissuecard
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 补卡时间点
+        /// </summary> 
+        public DateTime? ReissueCardTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 缺卡原因
+        /// </summary>  
+        public string Description
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 图片
+        /// </summary>        
+        public string Image
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
+        /// </summary>        
+        public WFAuditStatus? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateBy
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateTime
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateBy
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属模版id
+        /// </summary>        
+        public int? TemplateId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团
+        /// </summary>        
+        public int? RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属公司
+        /// </summary>        
+        public int? RB_BranchId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流条件表id
+        /// </summary>        
+        public int? ConditionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 补卡记录id
+        /// </summary>        
+        public int? AttendanceRecordId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 补卡类型 1上班补卡，2下班补卡
+        /// </summary>        
+        public int? ReissuecardType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否是撤销流程   1正常  2 撤销
+        /// </summary>
+        public WFAuditCancelStatus? IsCancel { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_SignIn.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+	/// rb_workflow_signin:实体类(属性说明自动提取数据库字段的描述信息)
+	/// </summary>
+	[Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_SignIn
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 签到者
+        /// </summary>      
+        public int? EmployeeId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 签到时间
+        /// </summary>     
+        public DateTime? SignInTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 图片
+        /// </summary>        
+        public string Image
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 签到地点
+        /// </summary>          
+        public string Address
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 签到坐标
+        /// </summary>    
+        public string MapCoordinate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 备注
+        /// </summary>       
+        public string Remarks
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团
+        /// </summary>        
+        public int? RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属公司
+        /// </summary>        
+        public int? RB_BranchId
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Template.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_template Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Template
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 流程名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1正常  2 停用    3删除-->add by:2018-08-23 财务自定义 
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分组类型 1出勤休假
+        /// </summary>        
+        public WFTGroupTypeEnum? GroupType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属集团
+        /// </summary>        
+        public int? RB_GroupId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属公司
+        /// </summary>        
+        public int? RB_BranchId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateBy
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateTime
+        /// </summary>        
+        public DateTime? CreateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateBy
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateTime
+        /// </summary>        
+        public DateTime? UpdateTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1请假  2出差  3  外出  4  补卡 5-收款流程  6- 付款流程 7-发票流程
+        /// </summary>        
+        public WFTTemplateTypeEnum? TemplateType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1 不启用自动去重  2同一个审批人在流程中出现多次时，仅保留第一个 3同一个审批人在流程中出现多次时，仅保留最后一个  4同一个审批人仅在连续出现时，自动去重
+        /// </summary>        
+        public int? AuditDistinct
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1 仅全部同意后通知 2仅发起时通知  3发起时和全部同意后均通知
+        /// </summary>        
+        public int? NotificationCP
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 类型 1-OA，2-财务
+        /// </summary>
+        public int? Type { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string DescribeInfo { get; set; }
+        /// <summary>
+        /// 1-收入2-支出
+        /// </summary>
+        public int? TempLateClass { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Travel.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_travel Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Travel
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属出差id
+        /// </summary>        
+        public int? EvectionId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1飞机  2 火车  3 汽车  4 其他
+        /// </summary>        
+        public TravelVehicleEnum? Vehicle
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 1 单程  2 往返
+        /// </summary>        
+        public TravelVehicleTypeEnum? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 出发城市
+        /// </summary>             
+        public string DepartCity
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 目的地城市
+        /// </summary>    
+        public string DestinationCity
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开始时间
+        /// </summary> 
+        public DateTime? StartTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 结束时间
+        /// </summary>   
+        public DateTime? EndTime
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 时长
+        /// </summary> 
+        public double? Duration
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+    }
+}
\ No newline at end of file

Edu.Model/Entity/User/Rb_Workflow_Visualrange.cs

+using Edu.Common.Enum.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.User
+{
+
+    /// <summary>
+    /// rb_workflow_travel Entity
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Workflow_Visualrange
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 模版id
+        /// </summary>
+        public int TemplateId { get; set; }
+        /// <summary>
+        /// 员工id
+        /// </summary>
+        public int TypeId { get; set; }
+        /// <summary>
+        /// 类型 1员工  2部门
+        /// </summary>
+        public int Type { get; set; }
+
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Log/RB_User_ChangeLog_ViewModel.cs

+using Edu.Model.Entity.Log;
+
+namespace Edu.Model.ViewModel.Log
+{
+    /// <summary>
+    /// 用户信息修改记录视图实体类
+    /// </summary>
+    public class RB_User_ChangeLog_ViewModel : RB_User_ChangeLog
+    {
+        /// <summary>
+        /// 具体时间
+        /// </summary>
+        public string TimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } }
+
+        /// <summary>
+        /// 年月
+        /// </summary>
+        public string DayStr { get { return Common.ConvertHelper.FormatMonthDay(this.CreateTime); } }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 星期几
+        /// </summary>
+        public string WeekDay { get { return Common.ConvertHelper.GetWeekDay(this.CreateTime); } }
+    }
+}

Edu.Model/ViewModel/User/AuditInfoModel.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.User
+{
+    /// <summary>
+    /// 动态表单数据
+    /// </summary>
+    public class AuditInfoModel
+    {
+        /// <summary>
+        /// 表单名
+        /// </summary>
+        public string title { get; set; }
+
+        /// <summary>
+        /// 表单值
+        /// </summary>
+        public object value { get; set; }
+
+        /// <summary>
+        /// 表单类型
+        /// </summary>
+        public string formType { get; set; }
+    }
+    /// <summary>
+    /// 详情类型枚举
+    /// </summary>
+    public enum AuditInfoTypeEnum
+    {
+        /// <summary>
+        /// string类型数据
+        /// </summary>
+        [EnumField("String")]
+        String = 1,
+        /// <summary>
+        /// json格式数据
+        /// </summary>
+        [EnumField("Json")]
+        Json = 2,
+        /// <summary>
+        /// Image格式数据
+        /// </summary>
+        [EnumField("Image")]
+        Image = 3
+    }
+}

Edu.Model/ViewModel/User/RB_Attendance_LeaveTime_Extend.cs

+using Edu.Model.Entity.User;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.ViewModel.User
+{
+    /// <summary>
+    /// Rb_attendance Entity Model
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Attendance_LeaveTime_Extend : RB_Attendance_LeaveTime
+    {
+        
+    }
+    /// <summary>
+    /// 历史每月请假时长
+    /// </summary>
+    public class LeaveTimeHistory {
+        /// <summary>
+        /// 时长
+        /// </summary>        
+        public double? Duration
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 工作流id
+        /// </summary>
+        public int WorkFlowId { get; set; }
+    }
+}
\ No newline at end of file