商业版后台

15ef357e · Skyeye云 · be3d3808 · 15ef357e · 15ef357e · 15ef357e
1000 changed file
--- a/skyeye-promote/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
+++ b/skyeye-promote/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch
--- a/skyeye-promote/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
+++ b/skyeye-promote/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
--- a/skyeye-promote/.project
+++ b/skyeye-promote/.project
--- a/Java学习目录.md
+++ b/Java学习目录.md
--- a/LICENSE
+++ b/LICENSE
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/README.md
+++ b/README.md
 # skyeye

-#### 项目介绍
+# 开源版请下载`master`分支

-智能办公OA系统[SpringBoot2-快速开发平台]，适用于医院，学校，中小型企业等机构的管理。包含文件在线操作、工作日志、多班次考勤、CRM、ERP进销存、项目管理、EHR、拖拽式生成问卷、日程、笔记、工作计划、行政办公、薪资模块、动态表单、知识库、公告模块、企业论坛、云售后模块、生产模块、系统模块化同步模块等多种复杂业务功能。
-
- 开源不易，给个`star`吧
- erp+生产演示视频：https://mp.weixin.qq.com/s/CrFM_VZShi-FIJ8zD0_Nqg
- 需要进微信群(加我拉你进群，wzq_598748873)，请提供自己的邮箱，默认订阅每周更新内容推送。
- 不需要进群的，请直接加微信：ZhiJinShuLi
- `本项目分为开源版和企业版，不喜勿喷，谢谢。`
- 企业版信息：https://docs.qq.com/doc/DQlRxcVRMWWVjbU1i?_from=1&disableReturnList=1
- 不会搭建环境的，可以出钱让作者帮忙搭建，一次100，先付。
- 现接受财务模块+ERP模块的功能扩展需求，有意向的可将需求文档发送给作者。
- [说明文档](https://gitee.com/doc_wei01/skyeye/blob/master/%E9%A1%B9%E7%9B%AE%E6%96%87%E6%A1%A3.md)
- 采用Redis缓存做单点登录功能，全新风格的后台管理系统
- [MIT协议的高性能报表软件](https://gitee.com/doc_wei01/skyeye-report)
-
-#### 功能介绍
-
-功能|简介|功能|简介
-------|-------|-------|-------
-菜单管理|配置系统菜单，操作权限，按钮权限标识等，用户可自定义桌面展示LOGO|员工管理|操作企业内部的员工信息，进行统一管理
-用户管理|用户是系统操作者，该功能主要完成系统用户配置。|角色管理|角色菜单权限分配、设置角色按机构进行数据范围权限划分。
-权限管理|给角色进行赋权|资源图标|系统中允许使用的font图标库
-日志管理|系统正常操作日志记录和查询；系统异常信息日志记录和查询。|登录日志|系统登录日志记录查询包含登录异常。
-多桌面管理|多个桌面程序，用户可通过鼠标滚动进行切换|系统基础设置|系统的基础信息设置
-代码生成器|只能适用于该框架的代码生成器，配置模板即可生成，然后下载压缩包解压复制到项目中即可|自定义桌面菜单|用户可将自己常用的网站添加到系统中方便记录
-在线性能监控|监视当前系统CPU、内存、磁盘、堆栈等相关信息。|多桌面|[演示](https://www.bilibili.com/video/av43650484)
-聊天功能|[演示](https://www.bilibili.com/video/av43650782)，支持单聊，群聊，进群申请，组建群组，在线用户监控等。|[我的日程](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/%E6%97%A5%E7%A8%8B%E6%A8%A1%E5%9D%97.md)(企业版)|[演示](https://www.bilibili.com/video/av45854959)|APP菜单管理(企业版)|手机端菜单以及权限管理
-小程序管理(企业版)|微信小程序、H5手机自适应页面拖拽生成，可自定义配置小程序组件|多系统集成(企业版)|可以将多个系统进行应用集成，无需多次登陆，无需记录多个网址
-流程图规划(企业版)|规划项目的流程图|问卷调查(企业版)|拖拽式生成问卷，可分页、复制、查看统计信息等
-轻应用(企业版)|系统中提供各种小应用，如快递查询、高德地图等，用户可添加到自己的桌面上|开发文档(企业版)|系统支持二次开发，包含开发文档
-工作日志(企业版)|记录每个员工的日报，周报，月报等，可同时发送多人，按时间轴查看等|多班次考勤管理(企业版)|记录每个员工的考勤打卡信息，包含报表，打卡，班次设置等
-[我的笔记](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/%E7%AC%94%E8%AE%B0%E6%A8%A1%E5%9D%97.md)(企业版)|员工可记录自己日常的笔记，目前支持MD，富文本，表格操作|报表管理(企业版)|统计功能信息，可根据客户自定义免费定制
-[文件管理](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/%E6%96%87%E4%BB%B6%E7%AE%A1%E7%90%86.md)(企业版)|公司内部、员工个人的文件管理，支持多格式文件在线查看，文档多人协作，在线解压缩等|附件管理(企业版)|保留员工所有上传过的附件，方便下次使用
-邮件管理(企业版)|目前打通与QQ邮箱的交互，可以发邮件，收邮件，保存为草稿等|[工作流管理](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%BB%8B%E7%BB%8D%E6%96%87%E6%A1%A3.md)(企业版)|动态表单结合工作流生成自定义业务流程审核,可进行审批、撤回、回退、节点化表单项编辑设置、驳回、终止转办等功能，目前已支持四十多种流程管理
-论坛(企业版)|包括标签管理，关键词管理，举报审核等操作，用户可自由发表文章，系统通过过滤算法进行关键词过滤|计划管理(企业版)|方便公司进行公司计划、部门计划、个人计划的规划，可根据类型（日计划、周计划、月计划、季度计划等）进行定义
-动态表单(企业版)|通过自定义的方式生成提交表单页，可与动态数据进行结合，目前已和工作流结合|行政管理(企业版)|包含车辆管理、会议室管理、用品管理、印章管理、财产管理、证照管理。所有功能审核已和工作流结合
-内部公告(企业版)|系统内部公告通知，可设置邮件通知，定时通知，人员选择等|通讯录(企业版)|记录个人、公司内部、公共通讯录信息
-知识库(企业版)|企业文化支柱；[效果地址](https://gitee.com/doc_wei01/knowlg-pro)|[CRM客户管理](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/CRM%E5%AE%A2%E6%88%B7%E7%AE%A1%E7%90%86%E6%A8%A1%E5%9D%97.md)(企业版)|包含客户、商机、跟单、合同等多个模块化功能
-[ERP进销存管理](https://gitee.com/doc_wei01/erp-pro)(企业版)|包含采购、销售、零售、客户、供应商等多个模块化功能；[效果地址](https://gitee.com/doc_wei01/erp-pro)|[项目管理](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86.md)(企业版)|包含项目、工作量、讨论帖、项目文档、成本费用等功能
-[云售后管理系统](https://gitee.com/doc_wei01/skyeye/blob/master/%E5%8A%9F%E8%83%BD%E6%96%87%E6%A1%A3%E4%BB%8B%E7%BB%8D/%E5%94%AE%E5%90%8E%E5%B7%A5%E5%8D%95%E6%A8%A1%E5%9D%97.md)(企业版)|包含工单的派工，接单，签到，配件申领审批，完工，评价，审核等操作|生产模块(企业版)|已完成，[演示视频](https://www.bilibili.com/video/BV1yA411e7mm/)
-|学校模块以及考试模块(企业版)|[地址](https://gitee.com/doc_wei01/schoolExam)|EHR模块(企业版)|管理企业员工的基础信息|
-|薪资模块(企业版)|员工薪资管理，支持多种类型设定|||
-
-#### 技术选型
-
-##### 后端技术:
-
-技术|名称|官网
---|---|---
-SpringBoot|核心框架|http://spring.io/projects/spring-boot
-MyBatis|ORM框架|http://www.mybatis.org/mybatis-3/zh/index.html
-Druid|数据库连接池|https://github.com/alibaba/druid
-Maven|项目构建管理|http://maven.apache.org/
-redis|key-value存储系统|https://redis.io/
-webSocket|浏览器与服务器全双工(full-duplex)通信|http://www.runoob.com/html/html5-websocket.html
-Activiti|工作流引擎|https://www.activiti.org/
-spring mvc|视图框架|http://spring.io/
-quartz 2.2.2|定时任务|http://www.quartz-scheduler.org/
-ActiveMQ|消息队列|http://activemq.apache.org/replicated-leveldb-store.html
-solr|企业级搜索应用服务器|https://lucene.apache.org/solr/
-Spring Cloud|微服务框架(目前用户APP端接口)|https://springcloud.cc/
-
-##### 前端技术：
-
-技术|名称|官网
---|---|---
-jQuery|函式库|http://jquery.com/
-zTree|树插件|http://www.treejs.cn/v3/
-layui|模块化前端UI|https://www.layui.com/
-winui|win10风格UI|https://gitee.com/doc_wei01_admin/skyeye
-codemirror|codemirror代码编辑器|https://codemirror.net/
-handlebars|js模板引擎|http://www.ghostchina.com/introducing-the-handlebars-js-templating-engine/
-webSocket|浏览器与服务器全双工(full-duplex)通信|http://www.runoob.com/html/html5-websocket.html
-G6|流程图开发|https://antv.alipay.com/zh-cn/index.html
-FullCalendar|日历插件|https://blog.csdn.net/qw_xingzhe/article/details/44920943
-
-#### 代码描述
-##### 前后台接口映射
-
-```
-<url id="前端请求id" path="后台接口" val="备注" allUse="是否需要登录">
-	<property id="前端请求key" name="后台接收key" ref="限制条件（参考项目内文档）" var="key含义"/>
-</url>
-```
-
-##### 后台代码编写规范
-
-###### 控制层
-
-```
-@RequestMapping("后台接口")
-@ResponseBody
-public void 方法名(InputObject inputObject, OutputObject outputObject) throws Exception{
-	服务层接口对象.方法名(inputObject, outputObject);
-}
-```
-
-###### 服务层
-
-```
-@Override
-public void 方法名(InputObject inputObject, OutputObject outputObject) throws Exception {
-	Map<String, Object> map = inputObject.getParams();//接收参数
-	Map<String, Object> user = inputObject.getLogParams();//获取当前登录用户信息
-	/**
-	 * 业务逻辑
-	 */
-	outputObject.setBean(bean);//返回单个实体Bean
-	outputObject.setBeans(beans);//返回集合
-	outputObject.settotal(total);//返回数量
-	outputObject.setreturnMessage("信息");//返回前端的错误信息
-	outputObject.setreturnMessage("信息", 错误码);//返回前端的错误信息，同时抛出异常（不常用）
-}
-```
-
-
-
-#### 效果图
-
-|效果图|效果图|
-| ------------- | ------------- |
-|![](https://s2.ax1x.com/2019/04/16/Avo0c8.png "1.png")|![](https://images.gitee.com/uploads/images/2019/0623/142954_6c8612f2_1541735.png "1.png")|
-|![](https://images.gitee.com/uploads/images/2018/1107/104734_d9304e60_1541735.png "2.png")|![](https://images.gitee.com/uploads/images/2018/1107/104903_f244dfde_1541735.png "3.png")|
-|![](https://s2.ax1x.com/2019/06/23/ZPS5h4.png)|![](https://images.gitee.com/uploads/images/2018/1118/191634_497ea929_1541735.png "微信图片_20181118191516.png")|
-|![](https://images.gitee.com/uploads/images/2018/1118/193301_72d0bb49_1541735.png "微信截图_20181118193254.png")|![](https://s2.ax1x.com/2019/04/16/Av7lee.png "微信截图_20181120154643.png")|
-|![](https://images.gitee.com/uploads/images/2018/1121/105120_65de9434_1541735.png "1.png")|![](https://images.gitee.com/uploads/images/2019/0623/145248_4a51c610_1541735.png)|
-|![](https://images.gitee.com/uploads/images/2019/0122/113516_b0600e8f_1541735.png "1.png")|![](https://images.gitee.com/uploads/images/2018/1207/123501_3248346e_1541735.png "微信截图_20181207123447.png")|
-|![](https://images.gitee.com/uploads/images/2019/0113/114947_1c7fa387_1541735.png "微信截图_20190113114922.png")|![](https://images.gitee.com/uploads/images/2019/0202/130711_7ed57951_1541735.png "3.png")|
-|![](https://s2.ax1x.com/2019/06/23/ZPC6cd.png)|![](https://images.gitee.com/uploads/images/2019/0623/145351_dd55da65_1541735.png)|
-|![](https://images.gitee.com/uploads/images/2019/0623/143810_e76aec71_1541735.png)|![](https://images.gitee.com/uploads/images/2019/0623/144143_1063782a_1541735.png)|
-|![](https://images.gitee.com/uploads/images/2019/0904/143828_b7ef9748_1541735.png)|![](https://images.gitee.com/uploads/images/2019/0904/143937_42519798_1541735.png)|
-
-#### 传统风格界面效果图
-
-|效果图|效果图|
-| ------------- | ------------- |
-|![](https://images.gitee.com/uploads/images/2019/0904/143634_0c9da9ad_1541735.png)|![](https://images.gitee.com/uploads/images/2019/0904/143639_2e442328_1541735.png)|
-|![输入图片说明](https://images.gitee.com/uploads/images/2019/1101/170700_738ed970_1541735.png "在这里输入图片标题")||
-
-
-#### 合作方式
-
- 购买企业版源码
- 购买企业版Jar包
- 客户可提供文字版合作方式
-
-### 捐助
-如果您觉得我们的开源软件对你有所帮助，请扫下方二维码打赏我们一杯咖啡。
-| 支付宝 | 微信 | 更新资讯公众号 |
-| ------ | ---- | ---- |
-| ![      ](https://images.gitee.com/uploads/images/2019/1016/094014_96f92c56_1541735.png "微信截图_20191016093832.png") | ![     ](https://images.gitee.com/uploads/images/2019/1016/094025_65ba24f0_1541735.png "微信截图_20191016093850.png")|![输入图片说明](https://images.gitee.com/uploads/images/2021/0320/091531_8c3ba4d8_1541735.jpeg "qrcode_for_gh_e7f97ff1beda_430.jpg")|
--- a/docs/apollo配置项
+++ b/docs/apollo配置项
-
-server.port = 8081
-IMAGES_PATH = D:/other-pro/skyeye-kaiyuan/images/
-java.request.url.mappimg = mapping/reqmapping.xml,mapping/reqcommon.xml,mapping/reqcompany.xml,mapping/reqcodemodel.xml,mapping/reqdsform.xml,mapping/reqrmxcx.xml,mapping/reqsys.xml
-jdbc.database.driverClassName = com.mysql.jdbc.Driver
-jdbc.database.name = ky_eve
-jdbc.database.username = root
-jdbc.database.password = 123456
-jdbc.maxActive = 10
-jdbc.initialSize = 1
-jdbc.minIdle = 5
-jdbc.poolPreparedStatements = true
-jdbc.maxWait = 60000
-jdbc.maxPoolPreparedStatementPerConnectionSize = 33
-spring.resources.static-locations = classpath:/template/
-activiti.database.name = ky_activitidb
-activiti.database.username = root
-activiti.database.password = 123456
-redis.ip1 = 192.168.1.140
-redis.host1 = 9000
-redis.ip2 = 192.168.1.140
-redis.host2 = 9001
-redis.ip3 = 192.168.1.140
-redis.host3 = 9002
-redis.ip4 = 192.168.1.140
-redis.host4 = 9003
-redis.ip5 = 192.168.1.140
-redis.host5 = 9004
-redis.ip6 = 192.168.1.140
-redis.host6 = 9005
-redis.commandTimeout = 1000
-
-
-
--- a/docs/提需求模板.md
+++ b/docs/提需求模板.md
-如果需要提需求，请按照一下模板提供：
-
- 标题(必填)：采购订单提供最晚时间规格
- 需求背景(必填)：提供支持用户查看到货时间功能，到货前N天发送系统消息、短信、邮件通知订单创建人
- 需求规格(必填)：用户可以在采购订单功能中查阅到货物的到货时间，并在到货时间即将过期时进行消息通知
- 功能点(必填)：
-  - 1.采购订单新增和编辑页面增加【最晚到货时间】标识，可任意修改，对时间没有任何限制
-  - 2.采购订单列表增加【最晚到货时间】列展示
-  - 3.到货前N天，如果用户未更新实际到货时间，则需要发送系统消息、短信、邮件通知订单创建人(定时任务：如果【最晚到货时间】是当前时间之前的，则不设置)
- 原型图(非必填)：
--- a/images/upload/userphoto/1544084996341.jpg
+++ b/images/upload/userphoto/1544084996341.jpg
--- a/images/upload/userphoto/1544085011852.jpg
+++ b/images/upload/userphoto/1544085011852.jpg
--- a/images/upload/userphoto/1544085024692.jpg
+++ b/images/upload/userphoto/1544085024692.jpg
--- a/images/upload/userphoto/1544428713964.jpg
+++ b/images/upload/userphoto/1544428713964.jpg
--- a/images/upload/winbgpic/1544084104539.jpg
+++ b/images/upload/winbgpic/1544084104539.jpg
--- a/ky_activitidb.sql
+++ b/ky_activitidb.sql
--- a/ky_eve.sql
+++ b/ky_eve.sql
--- a/patch.diff
+++ b/patch.diff
-From 425fa0c0ae90722ca9fa841a6067a75b4d15244e Mon Sep 17 00:00:00 2001
-From: doc_wei <598748873@qq.com>
-Date: Fri, 18 Sep 2020 12:55:38 +0800
-Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20CHANGELOG?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
---
- CHANGELOG | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 CHANGELOG
-
-diff --git a/CHANGELOG b/CHANGELOG
-new file mode 100644
-index 0000000..e69de29
-- 
-2.21.0.windows.1
-
--- a/pom.xml
+++ b/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.skyeye</groupId>
+	<artifactId>skyeye-promote</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.5.RELEASE</version>
+	</parent>
+
+	<modules>
+		<module>skyeye-web</module>
+		<module>skyeye-common</module>
+		<module>skyeye-entity</module>
+		<module>skyeye-activiti</module>
+		<module>skyeye-quartz</module>
+		<module>skyeye-mq</module>
+		<module>skyeye-solr</module>
+		<module>skyeye-dsform</module>
+		<module>skyeye-userauth</module>
+		<module>skyeye-threed</module>
+		<module>skyeye-crm</module>
+		<module>skyeye-rmprogram</module>
+		<module>skyeye-message</module>
+		<module>skyeye-knowlg</module>
+		<module>skyeye-pro</module>
+		<module>skyeye-erp</module>
+		<module>skyeye-admin-assistant</module>
+		<module>skyeye-forum</module>
+		<module>skyeye-disk-cloud</module>
+		<module>skyeye-seal-service</module>
+		<module>skyeye-note</module>
+		<module>skyeye-light-app</module>
+		<module>skyeye-code-doc</module>
+		<module>skyeye-survey</module>
+		<module>skyeye-jobdiary</module>
+		<module>skyeye-checkwork</module>
+		<module>skyeye-email</module>
+		<module>skyeye-mail</module>
+		<module>skyeye-schedule</module>
+		<module>skyeye-planpro</module>
+		<module>skyeye-workplan</module>
+		<module>skyeye-user-phone</module>
+		<module>skyeye-exam</module>
+		<module>skyeye-school</module>
+		<module>skyeye-school-phone</module>
+		<module>skyeye-erp-produce</module>
+		<module>skyeye-gateway</module>
+		<module>skyeye-md2file</module>
+    	<module>skyeye-ehr</module>
+        <module>skyeye-wages</module>
+        <module>skyeye-organization</module>
+        <module>skyeye-api</module>
+        <module>skyeye-ifs</module>
+    </modules>
+
+	<properties>
+		<netjson.version>2.4</netjson.version>
+		<quartz.version>2.2.2</quartz.version>
+		<commons-fileupload.version>1.3.1</commons-fileupload.version>
+		<druid.version>1.0.20</druid.version>
+		<aliyun.java.sdk.core.version>3.7.1</aliyun.java.sdk.core.version>
+		<aliyun.java.sdk.dysmsapi.version>1.1.0</aliyun.java.sdk.dysmsapi.version>
+		<commons-lang3.version>3.3.2</commons-lang3.version>
+		<activiti.version>5.22.0</activiti.version>
+
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+
+		<!-- SpringBoot相关配置 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- webSocket -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+
+		<!-- aop切面 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+
+		<!-- 日志处理 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j</artifactId>
+			<version>1.3.8.RELEASE</version>
+		</dependency>
+
+		<!-- 重要的是这个POM配置，MyBatis相关操作都在这个包中 -->
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+		<!-- pagehelper分页插件 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.5</version>
+		</dependency>
+
+		<!-- MySql数据库连接包 -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.34</version>
+		</dependency>
+
+		<!--commons-lang3 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+
+		<!-- jsoup解析 -->
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.7.3</version>
+		</dependency>
+
+		<!-- json-lib -->
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>${netjson.version}</version>
+			<classifier>jdk15</classifier>
+		</dependency>
+
+		<!-- httpclient -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+
+		<!-- quartz任务调度框架 -->
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/javax.persistence/persistence-api -->
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>persistence-api</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+
+		<!-- 单元测试 -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- 时间操作组件 -->
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
+
+		<!--热更新，热加载，不用每次重启启动�?????? -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+			<scope>true</scope>
+		</dependency>
+
+		<!-- 文件上传组件 -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>${commons-fileupload.version}</version>
+		</dependency>
+
+		<!-- redis依赖 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+		</dependency>
+
+		<!-- solr客户 -->
+		<dependency>
+			<groupId>org.apache.solr</groupId>
+			<artifactId>solr-solrj</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+		</dependency>
+
+		<!-- JMail组件 -->
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>javax.mail</artifactId>
+		</dependency>
+
+		<!-- pdf导出jar -->
+		<!-- https://mvnrepository.com/artifact/com.lowagie/itext -->
+		<dependency>
+			<groupId>com.lowagie</groupId>
+			<artifactId>itext</artifactId>
+			<version>4.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.itextpdf</groupId>
+			<artifactId>itext-asian</artifactId>
+			<version>5.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.itextpdf</groupId>
+			<artifactId>itextpdf</artifactId>
+			<version>5.4.3</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>28.0-jre</version>
+		</dependency>
+
+
+		<!-- apollo -->
+		<dependency>
+			<groupId>com.ctrip.framework.apollo</groupId>
+			<artifactId>apollo-client</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.2</version>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
--- a/skyeye-activiti/.gitignore
+++ b/skyeye-activiti/.gitignore
+/target/
--- a/skyeye-promote/skyeye-activiti/.project
+++ b/skyeye-promote/skyeye-activiti/.project
--- a/skyeye-promote/skyeye-activiti/lib/dcharts-widget-0.10.0.jar
+++ b/skyeye-promote/skyeye-activiti/lib/dcharts-widget-0.10.0.jar
--- a/skyeye-activiti/pom.xml
+++ b/skyeye-activiti/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>skyeye-promote</artifactId>
+		<groupId>com.skyeye</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>skyeye-activiti</artifactId>
+
+	<name>skyeye-activiti</name>
+	<url>http://www.example.com</url>
+
+	<dependencies>
+		
+		<!-- 引入dsform动态表单的依赖 -->
+		<dependency>
+			<groupId>com.skyeye</groupId>
+			<artifactId>skyeye-dsform</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		
+		<!-- 引入基础模块的依赖 -->
+		<dependency>
+			<groupId>com.skyeye</groupId>
+			<artifactId>skyeye-userauth</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		
+		<!-- activiti工作流 -->
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-spring-boot-starter-basic</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-spring-boot-starter-actuator</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-rest</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-codec</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-css</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-svg-dom</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-svggen</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-explorer</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.vaadin.addons</groupId>
+			<artifactId>dcharts-widget</artifactId>
+			<version>0.10.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/dcharts-widget-0.10.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-modeler</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-diagram-rest</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-simple-workflow</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-spring</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+	</build>
+</project>
--- a/skyeye-activiti/src/main/java/com/json/entity/AssetArticlesPurchaseEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/AssetArticlesPurchaseEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AssetArticlesPurchaseEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"责任人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"用品\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+			Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+            	jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"typeName\", \"title\": \"用品类别\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"articleName\", \"title\": \"用品名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"specificationsName\", \"title\": \"规格(单位)\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"applyPurchaseNum\", \"title\": \"申请采购数量\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"actualPurchaseNum\", \"title\": \"实购数量\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/AssetArticlesUseEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/AssetArticlesUseEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AssetArticlesUseEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"责任人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"用品\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"typeName\", \"title\": \"用品类别\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"articleName\", \"title\": \"用品名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"specificationsName\", \"title\": \"规格(单位)\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"applyUseNum\", \"title\": \"领用数量\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"actualUseNum\", \"title\": \"实发数量\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/AssetPurchaseEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/AssetPurchaseEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AssetPurchaseEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"责任人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"资产\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"typeName\", \"title\": \"资产类别\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"managementName\", \"title\": \"资产名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"managementImg\", \"title\": \"图片\", \"align\": \"left\", \"width\": 80},"
+            				+ "{ \"field\": \"assetNum\", \"title\": \"编号\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"fromId\", \"title\": \"来源\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/AssetReturnEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/AssetReturnEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AssetReturnEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"责任人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"资产\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"typeName\", \"title\": \"资产类别\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"assetName\", \"title\": \"资产名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"specificationsName\", \"title\": \"规格\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"assetNum\", \"title\": \"编号\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/AssetUseEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/AssetUseEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AssetUseEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"责任人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"资产\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"typeName\", \"title\": \"资产类别\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"assetName\", \"title\": \"资产名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"specificationsName\", \"title\": \"规格\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"assetNum\", \"title\": \"编号\", \"align\": \"left\", \"width\": 140},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/CheckWorkBusinessTripEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/CheckWorkBusinessTripEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: CheckWorkBusinessTripEntity
+ * @Description: 构造出差申请提交到工作流的对象
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/13 22:08
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class CheckWorkBusinessTripEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        USER_NAME("userName", "{\"name\": \"申请人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        BUSINESS_TRIP_ADDRESS("businessTripAddress", "{\"name\": \"出差地点\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        BUSINESS_TRIP_REASON("businessTripReason", "{\"name\": \"出差事由\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        GOODS("businessTripDay", "{\"name\": \"日期\", \"orderBy\": \"6\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"8\", \"showType\": \"2\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+                Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    jObject.put("headerTitle", "[{ \"field\": \"timeName\", \"title\": \"班次\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"businessTravelDay\", \"title\": \"出差日期\", \"align\": \"center\", \"width\": 100},"
+                            + "{ \"field\": \"timeStartTime\", \"title\": \"出差开始时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"timeEndTime\", \"title\": \"出差结束时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"businessTravelHour\", \"title\": \"出差工时\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 120},"
+                            + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/CheckWorkCancelLeaveEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/CheckWorkCancelLeaveEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: CheckWorkCancelLeaveEntity
+ * @Description: 构造销假申请提交到工作流的对象
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/14 11:50
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class CheckWorkCancelLeaveEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        USER_NAME("userName", "{\"name\": \"申请人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        GOODS("cancelLeaveDay", "{\"name\": \"日期\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+                Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    jObject.put("headerTitle", "[{ \"field\": \"timeName\", \"title\": \"班次\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"timeStartTime\", \"title\": \"班次打卡时间(上班)\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"timeEndTime\", \"title\": \"班次打卡时间(上班)\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"cancelDay\", \"title\": \"销假日期\", \"align\": \"center\", \"width\": 100},"
+                            + "{ \"field\": \"cancelStartTime\", \"title\": \"开始时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"cancelEndTime\", \"title\": \"结束时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"cancelHour\", \"title\": \"销假工时\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 120},"
+                            + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/CheckWorkLeaveEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/CheckWorkLeaveEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: CheckWorkLeaveEntity
+ * @Description: 构造请假申请提交到工作流的对象
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/14 13:10
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class CheckWorkLeaveEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        USER_NAME("userName", "{\"name\": \"申请人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        GOODS("leaveDay", "{\"name\": \"日期\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+                Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    jObject.put("headerTitle", "[{ \"field\": \"timeName\", \"title\": \"班次\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"timeStartTime\", \"title\": \"班次打卡时间(上班)\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"timeEndTime\", \"title\": \"班次打卡时间(上班)\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"leaveTypeName\", \"title\": \"假期类型\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"leaveDay\", \"title\": \"请假日期\", \"align\": \"center\", \"width\": 100},"
+                            + "{ \"field\": \"leaveStartTime\", \"title\": \"开始时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"leaveEndTime\", \"title\": \"结束时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"leaveHour\", \"title\": \"请假工时\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 120},"
+                            + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/CheckWorkOvertimeEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/CheckWorkOvertimeEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: CheckWorkOvertimeEntity
+ * @Description: 构造加班申请提交到工作流的对象
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/14 13:43
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class CheckWorkOvertimeEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        USER_NAME("userName", "{\"name\": \"申请人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CONTENT("content", "{\"name\": \"加班事由\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        GOODS("overtimeDay", "{\"name\": \"日期\", \"orderBy\": \"5\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"7\", \"showType\": \"2\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+                Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    jObject.put("headerTitle", "[{ \"field\": \"overtimeDay\", \"title\": \"加班日期\", \"align\": \"center\", \"width\": 100},"
+                            + "{ \"field\": \"overtimeStartTime\", \"title\": \"开始时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"overtimeEndTime\", \"title\": \"结束时间\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"overtimeHour\", \"title\": \"加班工时\", \"align\": \"left\", \"width\": 100},"
+                            + "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 120},"
+                            + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/ConferenceRoomReserveEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/ConferenceRoomReserveEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: ConferenceRoomReserveEntity
+ * @Description: 会议室预定实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/1 16:47
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class ConferenceRoomReserveEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"申请人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	RESERVESTATENAME("reserveStateName", "{\"name\": \"预定状态\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	CONFERENCEROOM("conferenceRoom", "{\"name\": \"会议室\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	STARTTIME("startTime", "{\"name\": \"开始时间\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	ENDTIME("endTime", "{\"name\": \"结束时间\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	RESERVEREASON("reserveReason", "{\"name\": \"使用事由\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"10\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/CrmContractEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/CrmContractEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: CrmContractEntity
+ * @Description: 客户合同提交到工作流中的对象
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/14 15:43
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class CrmContractEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+		CUSTOMERID("customerId", "{\"name\": \"客户\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CITY("city", "{\"name\": \"所在城市\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DETAILADDRESS("detailAddress", "{\"name\": \"详细地址\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		TITLE("title", "{\"name\": \"合同名称\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		NUM("num", "{\"name\": \"合同编号\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PRICE("price", "{\"name\": \"合同金额\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		SIGNINGTIME("signingTime", "{\"name\": \"签约日期\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		EFFECTTIME("effectTime", "{\"name\": \"生效日期\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		SERVICEENDTIME("serviceEndTime", "{\"name\": \"服务期至\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CONTACTS("contacts", "{\"name\": \"联系人\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		WORKPHONE("workPhone", "{\"name\": \"固定电话\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		MOBILEPHONE("mobilePhone", "{\"name\": \"移动电话\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		QQ("qq", "{\"name\": \"QQ号\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		EMAIL("email", "{\"name\": \"邮箱\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DEPARTMENTID("departmentId", "{\"name\": \"合同所属部门\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		RELATIONUSERID("relationUserId", "{\"name\": \"合同关联人员\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		STATE("stateName", "{\"name\": \"状态\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		USERNAME("userName", "{\"name\": \"创建人\", \"orderBy\": \"18\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		TECHNICALTERMS("technicalTerms", "{\"name\": \"主要技术条款\", \"orderBy\": \"19\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		BUSINESSTERMS("businessTerms", "{\"name\": \"主要商务条款\", \"orderBy\": \"20\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"21\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/CrmOpportunityTypeOneEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/CrmOpportunityTypeOneEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: CrmOpportunityTypeOneEntity
+ * @Description: 商机审核一阶段对象类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/14 16:53
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class CrmOpportunityTypeOneEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+		CUSTOMERID("customerId", "{\"name\": \"客户名称\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		INDUSTRYID("industryId", "{\"name\": \"所属行业\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CITY("city", "{\"name\": \"所在城市\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DETAILADDRESS("detailAddress", "{\"name\": \"详细地址\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		TITLE("title", "{\"name\": \"商机名称\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		FROMID("fromId", "{\"name\": \"商机来源\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ESTIMATEPRICE("estimatePrice", "{\"name\": \"预成交金\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ESTIMATEENDTIME("estimateEndTime", "{\"name\": \"预结单日\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CONTACTS("contacts", "{\"name\": \"联系人\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DEPARTMENT("department", "{\"name\": \"部门\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		JOB("job", "{\"name\": \"职务\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		WORKPHONE("workPhone", "{\"name\": \"办公电话\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		MOBILEPHONE("mobilePhone", "{\"name\": \"移动电话\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		EMAIL("email", "{\"name\": \"邮件\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		QQ("qq", "{\"name\": \"QQ\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		BUSINESSNEED("businessNeed", "{\"name\": \"主要业务\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"附件资料\", \"orderBy\": \"17\", \"showType\": \"2\", \"proportion\": \"12\"}"),
+		SUBDEPARTMENTS("subDepartments", "{\"name\": \"所属部门\", \"orderBy\": \"18\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		RESPONSID("responsId", "{\"name\": \"负责人\", \"orderBy\": \"19\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PARTID("partId", "{\"name\": \"参与人\", \"orderBy\": \"20\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		FOLLOWID("followId", "{\"name\": \"关注人\", \"orderBy\": \"21\", \"showType\": \"1\", \"proportion\": \"6\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/LicenceBorrowEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/LicenceBorrowEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: LicenceBorrowEntity
+ * @Description: 证照借用对象类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/7/24 23:12
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class LicenceBorrowEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"借用人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"证照\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"licenceName\", \"title\": \"证照名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/LicenceRevertEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/LicenceRevertEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: LicenceRevertEntity
+ * @Description: 证照归还对象类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/1 11:18
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class LicenceRevertEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"归还人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"证照\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"licenceName\", \"title\": \"证照名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/ProCostExpenseEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/ProCostExpenseEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: ProCostExpenseEntity
+ * @Description: 项目费用报销对象类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/11 22:41
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class ProCostExpenseEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"主题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	WRITEPEOPLE("userName", "{\"name\": \"报销人\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	WORKLOADTYPE("departmentName", "{\"name\": \"所属部门\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	PROJECTNAME("projectName", "{\"name\": \"所属项目\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	PROJECTNUMBER("reimbursementTime", "{\"name\": \"报销日期\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	TASKS("purposes", "{\"name\": \"任务\", \"orderBy\": \"6\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	ALLWORKLOAD("allPrice", "{\"name\": \"合计\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"附件\", \"orderBy\": \"8\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"expenseTypeId\", \"title\": \"支出分类\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"purposeContent\", \"title\": \"用途说明\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"price\", \"title\": \"费用金额\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"opposUnit\", \"title\": \"对方单位\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"experiencedPerson\", \"title\": \"经手人\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/ProFileEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/ProFileEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: ProFileEntity
+ * @Description: 项目文档审批对象类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/10 21:17
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class ProFileEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+		title("title", "{\"name\": \"名称\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		typeName("typeName", "{\"name\": \"所属分类\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		projectName("projectName", "{\"name\": \"所属项目\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		createName("userName", "{\"name\": \"创建人\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		content("content", "{\"name\": \"内容\", \"orderBy\": \"5\", \"showType\": \"3\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/ProProjectEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/ProProjectEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: ProProjectEntity
+ * @Description: 项目立项申请提交到工作流的对象
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/5 20:29
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class ProProjectEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+		PROJECTNAME("projectName", "{\"name\": \"项目名称\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		TYPENAME("typeName", "{\"name\": \"项目分类\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PROJECTNUMBER("projectNumber", "{\"name\": \"项目编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DEPARTMENTNAME("departmentName", "{\"name\": \"所属部门\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		STARTTIME("startTime", "{\"name\": \"计划开始时间\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ENDTIME("endTime", "{\"name\": \"计划完成时间\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CUSTOMERNAME("customerName", "{\"name\": \"客户名称\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CONTRACTNAME("contractName", "{\"name\": \"关联合同\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CONTACTNAME("contactName", "{\"name\": \"对方联系人\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		TELPHONE("telphone", "{\"name\": \"固定电话\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		MOBILE("mobile", "{\"name\": \"移动电话\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		QQ("qq", "{\"name\": \"QQ号\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		MAIL("mail", "{\"name\": \"邮箱\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ESTIMATEDWORKLOAD("estimatedWorkload", "{\"name\": \"预估工作量\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ESTIMATEDCOST("estimatedCost", "{\"name\": \"预估成本费用\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		STATENAME("stateName", "{\"name\": \"状态\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		BUSINESSCONTENT("businessContent", "{\"name\": \"需求和目标\", \"orderBy\": \"17\", \"showType\": \"3\", \"proportion\": \"12\"}"),
+		BUSINESSENCLOSUREINFO("businessEnclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"18\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/ProTaskEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/ProTaskEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: ProTaskEntity
+ * @Description: 项目任务实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/1 20:12
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class ProTaskEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+		FATHERORSON("fatherOrSon", "{\"name\": \"任务类型\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		TASKNAME("taskName", "{\"name\": \"名称\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		TASKTYPENAME("taskTypeName", "{\"name\": \"所属分类\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PROJECTNAME("projectName", "{\"name\": \"所属项目\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DEPARTMENTS("departments", "{\"name\": \"所属部门\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CREATEUSERNAME("userName", "{\"name\": \"创建人\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		CREATETIME("createTime", "{\"name\": \"创建时间\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		STARTTIME("startTime", "{\"name\": \"开始时间\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ENDTIME("endTime", "{\"name\": \"结束时间\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PERFORMID("performId", "{\"name\": \"执行人\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ESTIMATEDWORKLOAD("estimatedWorkload", "{\"name\": \"预估工作量\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		TASKINSTRUCTIONS("taskInstructions", "{\"name\": \"任务说明\", \"orderBy\": \"12\", \"showType\": \"3\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"附件\", \"orderBy\": \"13\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/ProWorkloadEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/ProWorkloadEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @ClassName: ProWorkloadEntity
+ * @Description: 项目工作量提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/8 13:18
+ *
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class ProWorkloadEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"主题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	WRITEPEOPLE("userName", "{\"name\": \"填报人\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	WORKLOADTYPE("workLoadType", "{\"name\": \"日期类型\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	PROJECTNAME("projectName", "{\"name\": \"所属项目\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	PROJECTNUMBER("projectNumber", "{\"name\": \"项目编号\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	TASKS("tasks", "{\"name\": \"任务\", \"orderBy\": \"6\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	ALLWORKLOAD("allworkload", "{\"name\": \"合计\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"附加描述\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"附件\", \"orderBy\": \"9\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		List<Map<String, Object>> items = map.containsKey(q.getNameCode()) ? (ArrayList<Map<String, Object>>) map.get(q.getNameCode()) : new ArrayList<>();
+            		Map<String, Object> item = items.get(0);
+            		jObject.put("headerTitle", "[{ \"field\": \"taskContent\", \"title\": \"填报人相关任务\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"executePeople\", \"title\": \"任务执行人\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"monAmount\", \"title\": \"周一(" + item.get("monTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"tuesAmount\", \"title\": \"周二(" + item.get("tuesTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"wedAmount\", \"title\": \"周三(" + item.get("wedTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"thurAmount\", \"title\": \"周四(" + item.get("thurTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"friAmount\", \"title\": \"周五(" + item.get("friTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"satuAmount\", \"title\": \"周六(" + item.get("satuTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"sunAmount\", \"title\": \"周日(" + item.get("sunTime").toString() + ")\", \"align\": \"left\", \"width\": 200},"
+            				+ "{ \"field\": \"allWorkLoad\", \"title\": \"小计\", \"align\": \"left\", \"width\": 70}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/SealBorrowEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/SealBorrowEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SealBorrowEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"借用人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"印章\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"sealName\", \"title\": \"印章名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/SealRevertEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/SealRevertEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SealRevertEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+    	TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+    	ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	USER_NAME("userName", "{\"name\": \"归还人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+    	GOODS("goods", "{\"name\": \"印章\", \"orderBy\": \"4\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+    	REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"6\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+            		jObject.put("headerTitle", "[{ \"field\": \"sealName\", \"title\": \"印章名称\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"stateName\", \"title\": \"状态\", \"align\": \"left\", \"width\": 150},"
+            				+ "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 150}]");
+            	}
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/VehicleUseEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/VehicleUseEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.json.entity;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class VehicleUseEntity {
+
+	public static Map<String, Object> transform(Map<String, Object> map) {
+		return Entity.getClockInState(map);
+	}
+	
+	public static enum Entity {
+		TITLE("title", "{\"name\": \"标题\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ODD_NUMBER("oddNumber", "{\"name\": \"单号\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		USER_NAME("userName", "{\"name\": \"责任人\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PASSENGERNUM("passengerNum", "{\"name\": \"乘车人数\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		PASSENGERINFO("passengerInfo", "{\"name\": \"乘车人信息\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		ISSELFDRIVE("isSelfDrive", "{\"name\": \"是否自驾\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DRIVERNAME("driverName", "{\"name\": \"驾驶人信息\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		DEPARTURETIME("departureTime", "{\"name\": \"用车时间段\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		DESIGNATEDVEHICLEINFO("designatedVehicleInfo", "{\"name\": \"指定车辆\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		TIMEANDPLACEOFTRAVEL("timeAndPlaceOfTravel", "{\"name\": \"乘车时间地点\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		VEHICLESTATENAME("vehicleStateName", "{\"name\": \"用车状态\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		VEHICLEINFO("vehicleInfo", "{\"name\": \"实际用车\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		VEHICLEIMG("vehicleImg", "{\"name\": \"车图片\", \"orderBy\": \"13\", \"showType\": \"4\", \"proportion\": \"12\"}"),
+		FUELCONSUMPTION("fuelConsumption", "{\"name\": \"用车油耗(L)\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		VEHICLECOST("vehicleCost", "{\"name\": \"用车费用(元)\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+		REASONSFORUSINGCAR("reasonsForUsingCar", "{\"name\": \"用车事由\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		REMARK("remark", "{\"name\": \"相关描述\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+		ENCLOSUREINFO("enclosureInfo", "{\"name\": \"相关附件\", \"orderBy\": \"18\", \"showType\": \"2\", \"proportion\": \"12\"}");
+		
+        private String nameCode;
+        private String str;
+		
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+	
+		public static Map<String, Object> getClockInState(Map<String, Object> map){
+        	Map<String, Object> bean = new HashMap<>();
+            for (Entity q : Entity.values()){
+				Map<String, Object> jObject = JSONUtil.toBean(q.getStr(), null);
+            	jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : ""); 
+            	bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+        
+        public String getNameCode() {
+			return nameCode;
+		}
+
+		public String getStr() {
+			return str;
+		}
+    }
+	
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/OtherOutLetsEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/OtherOutLetsEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 其他出库单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class OtherOutLetsEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"客户\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"收款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"本次收款\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    getItemListHeaderTitle(jObject);
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/OtherWareHousEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/OtherWareHousEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 其他入库单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class OtherWareHousEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"供应商\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"付款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"本次付款\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    getItemListHeaderTitle(jObject);
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/PurchaseOrderEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/PurchaseOrderEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 采购订单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class PurchaseOrderEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"供应商\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        PRODUCITON_ORDER_NUM("producitonOrderNum", "{\"name\": \"生产计划单\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"支付账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"付款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"支付金额\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    jObject.put("headerTitle", "[{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 150},"
+                            + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                            + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                            + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/PurchasePutEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/PurchasePutEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 采购入库单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class PurchasePutEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"供应商\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        PRODUCITON_ORDER_NUM("linkNumber", "{\"name\": \"所属采购单\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"付款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"本次付款\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OTHER_MONEY_LIST("otherMoneyList", "{\"name\": \"其他费用\", \"orderBy\": \"18\", \"showType\": \"5\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    if("items".equals(q.getNameCode())){
+                        getItemListHeaderTitle(jObject);
+                    } else if("otherMoneyList".equals(q.getNameCode())){
+                        getOtherMoneyListHeaderTitle(map, jObject);
+                    }
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getOtherMoneyListHeaderTitle(Map<String, Object> map, Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"name\", \"title\": \"支出项目\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"otherPrice\", \"title\": \"费用合计：" + map.get("otherMoney").toString() + "元\", \"align\": \"left\", \"width\": 200}]");
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/PurchaseReturnsEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/PurchaseReturnsEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 采购退货单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class PurchaseReturnsEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"供应商\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"付款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"本次退款\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OTHER_MONEY_LIST("otherMoneyList", "{\"name\": \"其他费用\", \"orderBy\": \"18\", \"showType\": \"5\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    if("items".equals(q.getNameCode())){
+                        getItemListHeaderTitle(jObject);
+                    } else if("otherMoneyList".equals(q.getNameCode())){
+                        getOtherMoneyListHeaderTitle(map, jObject);
+                    }
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getOtherMoneyListHeaderTitle(Map<String, Object> map, Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"name\", \"title\": \"支出项目\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"otherPrice\", \"title\": \"费用合计：" + map.get("otherMoney").toString() + "元\", \"align\": \"left\", \"width\": 200}]");
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/RetailOutLetEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/RetailOutLetEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 零售出库单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class RetailOutLetEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"会员\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        PAY_TYPE("payType", "{\"name\": \"收款类型\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"8\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"共计金额\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"收款金额\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        DISCOUNT("giveChange", "{\"name\": \"找零金额\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    getItemListHeaderTitle(jObject);
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/RetailReturnsEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/RetailReturnsEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 零售退货单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class RetailReturnsEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"会员\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        PAY_TYPE("payType", "{\"name\": \"退款类型\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"7\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"8\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"共计金额\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"退款金额\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        DISCOUNT("giveChange", "{\"name\": \"折损扣费\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    getItemListHeaderTitle(jObject);
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/SalesOrderEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/SalesOrderEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 销售订单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class SalesOrderEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"客户\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"录入日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"收款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"收款金额\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OTHER_MONEY_LIST("otherMoneyList", "{\"name\": \"其他费用\", \"orderBy\": \"18\", \"showType\": \"5\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    if("items".equals(q.getNameCode())){
+                        getItemListHeaderTitle(jObject);
+                    } else if("otherMoneyList".equals(q.getNameCode())){
+                        getOtherMoneyListHeaderTitle(map, jObject);
+                    }
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getOtherMoneyListHeaderTitle(Map<String, Object> map, Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"name\", \"title\": \"支出项目\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"otherPrice\", \"title\": \"费用合计：" + map.get("otherMoney").toString() + "元\", \"align\": \"left\", \"width\": 200}]");
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/SalesOutLetEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/SalesOutLetEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 销售出库单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class SalesOutLetEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"客户\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        PRODUCITON_ORDER_NUM("linkNumber", "{\"name\": \"所属销售单\", \"orderBy\": \"4\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"收款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"本次收款\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OTHER_MONEY_LIST("otherMoneyList", "{\"name\": \"其他费用\", \"orderBy\": \"18\", \"showType\": \"5\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    if("items".equals(q.getNameCode())){
+                        getItemListHeaderTitle(jObject);
+                    } else if("otherMoneyList".equals(q.getNameCode())){
+                        getOtherMoneyListHeaderTitle(map, jObject);
+                    }
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getOtherMoneyListHeaderTitle(Map<String, Object> map, Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"name\", \"title\": \"支出项目\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"otherPrice\", \"title\": \"费用合计：" + map.get("otherMoney").toString() + "元\", \"align\": \"left\", \"width\": 200}]");
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/json/entity/erp/SalesReturnsEntity.java
+++ b/skyeye-activiti/src/main/java/com/json/entity/erp/SalesReturnsEntity.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.json.entity.erp;
+
+import cn.hutool.json.JSONUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: PurchaseOrderEntity
+ * @Description: 销售退货单提交到工作流的实体类
+ * @author: skyeye云系列--卫志强
+ * @date: 2021/8/19 22:31
+ * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+public class SalesReturnsEntity {
+
+    public static Map<String, Object> transform(Map<String, Object> map) {
+        return Entity.getClockInState(map);
+    }
+
+    public static enum Entity {
+        SUPPLIER_NAME("supplierName", "{\"name\": \"客户\", \"orderBy\": \"1\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_TIME("operTime", "{\"name\": \"单据日期\", \"orderBy\": \"2\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        DEFAULT_NUMBER("defaultNumber", "{\"name\": \"单据编号\", \"orderBy\": \"3\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OPER_PERSON_NAME("operPersonName", "{\"name\": \"操作人\", \"orderBy\": \"5\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        CREATE_TIME("createTime", "{\"name\": \"操作日期\", \"orderBy\": \"6\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        ITEMS("items", "{\"name\": \"列表项\", \"orderBy\": \"7\", \"showType\": \"5\", \"proportion\": \"12\"}"),
+        ACCOUNT_NAME("accountName", "{\"name\": \"结算账户\", \"orderBy\": \"8\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        PAY_TYPE("payType", "{\"name\": \"退款类型\", \"orderBy\": \"9\", \"showType\": \"1\", \"proportion\": \"4\"}"),
+        TOTAL_PRICE("totalPrice", "{\"name\": \"金额合计\", \"orderBy\": \"10\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        TAX_LAST_MONEY_PRICE("taxLastMoneyPrice", "{\"name\": \"价税合计(元)\", \"orderBy\": \"11\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        REMARK("remark", "{\"name\": \"备注\", \"orderBy\": \"12\", \"showType\": \"1\", \"proportion\": \"12\"}"),
+        DISCOUNT("discount", "{\"name\": \"优惠率%\", \"orderBy\": \"13\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_MONEY("discountMoney", "{\"name\": \"退款优惠金额\", \"orderBy\": \"14\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        DISCOUNT_LAST_MONEY("discountLastMoney", "{\"name\": \"优惠后金额\", \"orderBy\": \"15\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        CHANGE_AMOUNT("changeAmount", "{\"name\": \"本次退款\", \"orderBy\": \"16\", \"showType\": \"1\", \"proportion\": \"3\"}"),
+        ARREARS("arrears", "{\"name\": \"本次欠款\", \"orderBy\": \"17\", \"showType\": \"1\", \"proportion\": \"6\"}"),
+        OTHER_MONEY_LIST("otherMoneyList", "{\"name\": \"其他费用\", \"orderBy\": \"18\", \"showType\": \"5\", \"proportion\": \"12\"}");
+
+        private String nameCode;
+        private String str;
+
+        Entity(String nameCode, String str){
+            this.nameCode = nameCode;
+            this.str = str;
+        }
+
+        public static Map<String, Object> getClockInState(Map<String, Object> map){
+            Map<String, Object> bean = new HashMap<>();
+            Map<String, Object> jObject;
+            for (Entity q : Entity.values()){
+                jObject = JSONUtil.toBean(q.getStr(), null);
+                jObject.put("value", map.containsKey(q.getNameCode()) ? map.get(q.getNameCode()) : "");
+                if("5".equals(jObject.get("showType").toString())){//展示为表格,特殊处理
+                    if("items".equals(q.getNameCode())){
+                        getItemListHeaderTitle(jObject);
+                    } else if("otherMoneyList".equals(q.getNameCode())){
+                        getOtherMoneyListHeaderTitle(map, jObject);
+                    }
+                }
+                bean.put(q.getNameCode(), jObject);
+            }
+            return bean;
+        }
+
+        public String getNameCode() {
+            return nameCode;
+        }
+
+        public String getStr() {
+            return str;
+        }
+    }
+
+    private static void getOtherMoneyListHeaderTitle(Map<String, Object> map, Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"name\", \"title\": \"支出项目\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"otherPrice\", \"title\": \"费用合计：" + map.get("otherMoney").toString() + "元\", \"align\": \"left\", \"width\": 200}]");
+    }
+
+    private static void getItemListHeaderTitle(Map<String, Object> jObject) {
+        jObject.put("headerTitle", "[{ \"field\": \"deportName\", \"title\": \"仓库\", \"align\": \"left\", \"width\": 150},"
+                + "{ \"field\": \"materialNames\", \"title\": \"产品(型号)\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"unitName\", \"title\": \"单位\", \"align\": \"left\", \"width\": 70},"
+                + "{ \"field\": \"operNumber\", \"title\": \"数量\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"unitPrice\", \"title\": \"单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"allPrice\", \"title\": \"金额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxRate\", \"title\": \"税率(%)\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxMoney\", \"title\": \"税额\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxUnitPrice\", \"title\": \"含税单价\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"taxLastMoney\", \"title\": \"合计价税\", \"align\": \"left\", \"width\": 80},"
+                + "{ \"field\": \"remark\", \"title\": \"备注\", \"align\": \"left\", \"width\": 100}]");
+    }
+
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/controller/ActivitiModelController.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/controller/ActivitiModelController.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.skyeye.activiti.service.ActivitiModelService;
+import com.skyeye.common.object.InputObject;
+import com.skyeye.common.object.OutputObject;
+
+@Controller
+public class ActivitiModelController {
+	
+	@Autowired
+	private ActivitiModelService activitiModelService;
+	
+    /**
+	 * 
+	     * @Title: insertNewActivitiModel
+	     * @Description: 新建一个空模型
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/insertNewActivitiModel")
+	@ResponseBody
+	public void insertNewActivitiModel(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.insertNewActivitiModel(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryActivitiModelList
+	     * @Description: 获取所有模型
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryActivitiModelList")
+	@ResponseBody
+	public void queryActivitiModelList(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryActivitiModelList(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editActivitiModelToDeploy
+	     * @Description: 发布模型为流程定义
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editActivitiModelToDeploy")
+	@ResponseBody
+	public void editActivitiModelToDeploy(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editActivitiModelToDeploy(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editActivitiModelToStartProcess
+	     * @Description: 启动流程
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editActivitiModelToStartProcess")
+	@ResponseBody
+	public void editActivitiModelToStartProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editActivitiModelToStartProcess(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editActivitiModelToRun
+	     * @Description: 提交任务
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editActivitiModelToRun")
+	@ResponseBody
+	public void editActivitiModelToRun(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editActivitiModelToRun(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: deleteActivitiModelById
+	     * @Description: 删除模型
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/deleteActivitiModelById")
+	@ResponseBody
+	public void deleteActivitiModelById(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.deleteActivitiModelById(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: deleteReleasedActivitiModelById
+	     * @Description: 取消发布
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/deleteReleasedActivitiModelById")
+	@ResponseBody
+	public void deleteReleasedActivitiModelById(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.deleteReleasedActivitiModelById(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryUserAgencyTasksListByUserId
+	     * @Description: 获取用户待办任务
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryUserAgencyTasksListByUserId")
+	@ResponseBody
+	public void queryUserAgencyTasksListByUserId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryUserAgencyTasksListByUserId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryReleaseActivitiModelList
+	     * @Description: 获取已发布模型
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryReleaseActivitiModelList")
+	@ResponseBody
+	public void queryReleaseActivitiModelList(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryReleaseActivitiModelList(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editApprovalActivitiTaskListByUserId
+	     * @Description: 导出model的xml文件
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editApprovalActivitiTaskListByUserId")
+	@ResponseBody
+	public void editApprovalActivitiTaskListByUserId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editApprovalActivitiTaskListByUserId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryUserListToActiviti
+	     * @Description: 获取人员选择
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryUserListToActiviti")
+	@ResponseBody
+	public void queryUserListToActiviti(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryUserListToActiviti(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryUserGroupListToActiviti
+	     * @Description: 获取组人员选择
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryUserGroupListToActiviti")
+	@ResponseBody
+	public void queryUserGroupListToActiviti(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryUserGroupListToActiviti(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryStartProcessNotSubByUserId
+	     * @Description: 获取我启动的流程
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryStartProcessNotSubByUserId")
+	@ResponseBody
+	public void queryStartProcessNotSubByUserId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryStartProcessNotSubByUserId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryMyHistoryTaskByUserId
+	     * @Description: 获取我的历史任务
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryMyHistoryTaskByUserId")
+	@ResponseBody
+	public void queryMyHistoryTaskByUserId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryMyHistoryTaskByUserId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: insertSyncUserListMationToAct
+	     * @Description: 用户以及用户组信息同步到act表中
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/insertSyncUserListMationToAct")
+	@ResponseBody
+	public void insertSyncUserListMationToAct(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.insertSyncUserListMationToAct(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: querySubFormMationByTaskId
+	     * @Description: 获取用户提交的表单信息根据taskid
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/querySubFormMationByTaskId")
+	@ResponseBody
+	public void querySubFormMationByTaskId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.querySubFormMationByTaskId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryApprovalTasksHistoryByProcessInstanceId
+	     * @Description: 获取历史审批列表
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryApprovalTasksHistoryByProcessInstanceId")
+	@ResponseBody
+	public void queryApprovalTasksHistoryByProcessInstanceId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryApprovalTasksHistoryByProcessInstanceId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryAllComplateProcessList
+	     * @Description: 获取所有已完成的流程信息
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryAllComplateProcessList")
+	@ResponseBody
+	public void queryAllComplateProcessList(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryAllComplateProcessList(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: queryAllConductProcessList
+	     * @Description: 获取所有待办的流程信息
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/queryAllConductProcessList")
+	@ResponseBody
+	public void queryAllConductProcessList(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.queryAllConductProcessList(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: updateProcessToHangUp
+	     * @Description: 流程挂起
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/updateProcessToHangUp")
+	@ResponseBody
+	public void updateProcessToHangUp(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.updateProcessToHangUp(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: updateProcessToActivation
+	     * @Description: 流程激活
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/updateProcessToActivation")
+	@ResponseBody
+	public void updateProcessToActivation(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.updateProcessToActivation(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: insertDSFormProcess
+	     * @Description: 提交审批
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/insertDSFormProcess")
+	@ResponseBody
+	public void insertDSFormProcess(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.insertDSFormProcess(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: querySubFormMationByProcessInstanceId
+	     * @Description: 获取用户提交的表单信息根据流程id
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/querySubFormMationByProcessInstanceId")
+	@ResponseBody
+	public void querySubFormMationByProcessInstanceId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.querySubFormMationByProcessInstanceId(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editProcessInstanceWithDraw
+	     * @Description: 流程撤回
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editProcessInstanceWithDraw")
+	@ResponseBody
+	public void editProcessInstanceWithDraw(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editProcessInstanceWithDraw(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editProcessInstancePicToRefresh
+	     * @Description: 刷新流程图
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editProcessInstancePicToRefresh")
+	@ResponseBody
+	public void editProcessInstancePicToRefresh(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editProcessInstancePicToRefresh(inputObject, outputObject);
+	}
+	
+	/**
+	 * 
+	     * @Title: editDsFormContentToRevokeByProcessInstanceId
+	     * @Description: 动态表单提交项进行撤销操作
+	     * @param inputObject
+	     * @param outputObject
+	     * @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/editDsFormContentToRevokeByProcessInstanceId")
+	@ResponseBody
+	public void editDsFormContentToRevokeByProcessInstanceId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.editDsFormContentToRevokeByProcessInstanceId(inputObject, outputObject);
+	}
+
+	/**
+	 *
+	 * @Title: copyModelByModelId
+	 * @Description: 流程模型拷贝
+	 * @param inputObject
+	 * @param outputObject
+	 * @throws Exception    参数
+	 * @return void    返回类型
+	 * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/copyModelByModelId")
+	@ResponseBody
+	public void copyModelByModelId(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.copyModelByModelId(inputObject, outputObject);
+	}
+
+	
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ActAssignee.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ActAssignee.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.entity;
+
+import javax.persistence.*;
+
+@Table(name = "act_assignee")
+public class ActAssignee {
+	@Id
+	@Column(name = "id")
+	private String id;
+
+	/**
+	 * 节点id
+	 */
+	private String sid;
+
+	/**
+	 * 办理人
+	 */
+	private String assignee;
+
+	/**
+	 * 候选组(角色)
+	 */
+	@Column(name = "role_id")
+	private String roleId;
+
+	/**
+	 * 办理人类型1办理人2候选人3组
+	 */
+	@Column(name = "assignee_type")
+	private Integer assigneeType;
+
+	/**
+	 * 节点名称
+	 */
+	@Column(name = "activti_name")
+	private String activtiName;
+
+	/**
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
+
+	/**
+	 * 获取节点id
+	 *
+	 * @return sid - 节点id
+	 */
+	public String getSid() {
+		return sid;
+	}
+
+	/**
+	 * 设置节点id
+	 *
+	 * @param sid
+	 *            节点id
+	 */
+	public void setSid(String sid) {
+		this.sid = sid == null ? null : sid.trim();
+	}
+
+	/**
+	 * 获取办理人
+	 *
+	 * @return assignee - 办理人
+	 */
+	public String getAssignee() {
+		return assignee;
+	}
+
+	/**
+	 * 设置办理人
+	 *
+	 * @param assignee
+	 *            办理人
+	 */
+	public void setAssignee(String assignee) {
+		this.assignee = assignee == null ? null : assignee.trim();
+	}
+
+	/**
+	 * 获取候选组(角色)
+	 *
+	 * @return role_id - 候选组(角色)
+	 */
+	public String getRoleId() {
+		return roleId;
+	}
+
+	/**
+	 * 设置候选组(角色)
+	 *
+	 * @param roleId
+	 *            候选组(角色)
+	 */
+	public void setRoleId(String roleId) {
+		this.roleId = roleId == null ? null : roleId.trim();
+	}
+
+	/**
+	 * 获取办理人类型1办理人2候选人3组
+	 *
+	 * @return assignee_type - 办理人类型1办理人2候选人3组
+	 */
+	public Integer getAssigneeType() {
+		return assigneeType;
+	}
+
+	/**
+	 * 设置办理人类型1办理人2候选人3组
+	 *
+	 * @param assigneeType
+	 *            办理人类型1办理人2候选人3组
+	 */
+	public void setAssigneeType(Integer assigneeType) {
+		this.assigneeType = assigneeType;
+	}
+
+	/**
+	 * 获取节点名称
+	 *
+	 * @return activti_name - 节点名称
+	 */
+	public String getActivtiName() {
+		return activtiName;
+	}
+
+	/**
+	 * 设置节点名称
+	 *
+	 * @param activtiName
+	 *            节点名称
+	 */
+	public void setActivtiName(String activtiName) {
+		this.activtiName = activtiName == null ? null : activtiName.trim();
+	}
+
+	public ActAssignee() {
+	}
+
+	public ActAssignee(String sid) {
+		this.sid = sid;
+	}
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ActDeployment.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ActDeployment.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+import org.activiti.engine.repository.Deployment;
+
+/**
+ * 
+ * @author 卫志强
+ *
+ */
+@Getter
+@Setter
+public class ActDeployment implements Serializable {
+	private static final long serialVersionUID = 5337694999055428654L;
+	private String id;
+	private String name;
+	private Date deploymentTime;
+	private String category;
+	private String tenantId;
+
+	public ActDeployment() {
+	}
+
+	public ActDeployment(Deployment deployment) {
+		this.id = deployment.getId();
+		this.name = deployment.getName();
+		this.deploymentTime = deployment.getDeploymentTime();
+		this.category = deployment.getCategory();
+		this.tenantId = deployment.getTenantId();
+	}
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ActModel.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ActModel.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.entity;
+
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+import org.activiti.engine.repository.Model;
+
+/**
+ * 
+ * @author 卫志强 模型列表
+ */
+@Getter
+@Setter
+public class ActModel {
+
+	private String id;
+	private String name;
+	private String key;
+	private String category;
+	private Date createTime;
+	private Date lastUpdateTime;
+	private Integer version;
+	private String metaInfo;
+	private String deploymentId;
+	private String tenantId;
+	private boolean hasEditorSource;
+
+	public ActModel() {
+	}
+
+	public ActModel(Model model) {
+		this.id = model.getId();
+		this.name = model.getName();
+		this.key = model.getKey();
+		this.category = model.getCategory();
+		this.createTime = model.getCreateTime();
+		this.lastUpdateTime = model.getLastUpdateTime();
+		this.version = model.getVersion();
+		this.metaInfo = model.getMetaInfo();
+		this.deploymentId = model.getDeploymentId();
+		this.tenantId = model.getTenantId();
+		this.hasEditorSource = model.hasEditorSource();
+	}
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/BaseTask.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/BaseTask.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/DeploymentResponse.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/DeploymentResponse.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.rest.common.util.DateToStringSerializer;
+import java.util.Date;
+
+/**
+ * 
+ * @author 卫志强
+ *
+ */
+public class DeploymentResponse {
+
+	private String id;
+	private String name;
+	@JsonSerialize(using = DateToStringSerializer.class, as = Date.class)
+	private Date deploymentTime;
+	private String category;
+	private String tenantId;
+
+	public DeploymentResponse(Deployment deployment) {
+		setId(deployment.getId());
+		setName(deployment.getName());
+		setDeploymentTime(deployment.getDeploymentTime());
+		setCategory(deployment.getCategory());
+		setTenantId(deployment.getTenantId());
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date getDeploymentTime() {
+		return deploymentTime;
+	}
+
+	public void setDeploymentTime(Date deploymentTime) {
+		this.deploymentTime = deploymentTime;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/LeaveOpinion.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/LeaveOpinion.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author 卫志强 请假流程 审批信息
+ */
+@Getter
+@Setter
+public class LeaveOpinion implements Serializable {
+
+	private static final long serialVersionUID = -6536860710977259314L;
+	// 审批人id
+	private String opId;
+	// 审批人姓名
+	private String opName;
+	// 审批意见
+	private String opinion;
+	// 审批时间
+	private Date createTime;
+	// 是否通过
+	private boolean flag;
+	// 流程id
+	private String taskId;
+
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ProcessDefinition.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/ProcessDefinition.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/Task.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/Task.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/UserLeave.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/entity/UserLeave.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/factory/ActivitiFactory.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/factory/ActivitiFactory.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/factory/ActivitiFactoryResult.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/factory/ActivitiFactoryResult.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/factory/ActivitiRunFactory.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/factory/ActivitiRunFactory.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/mapper/ActAssigneeMapper.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/mapper/ActAssigneeMapper.java
+/*******************************************************************************
+ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+package com.skyeye.activiti.mapper;
+
+public interface ActAssigneeMapper {
+	
+	public int deleteByNodeId(String nodeId) throws Exception;
+	
+}
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/mapper/ActivityMapper.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/mapper/ActivityMapper.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/ActAssigneeService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/ActAssigneeService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/ActivitiModelService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/ActivitiModelService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActAssigneeServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActAssigneeServiceImpl.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activity/main/StencilsetRestResource.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activity/main/StencilsetRestResource.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activity/model/ModelEditorJsonRestResource.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activity/model/ModelEditorJsonRestResource.java
--- a/skyeye-activiti/src/main/java/com/skyeye/activity/model/ModelSaveRestResource.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/activity/model/ModelSaveRestResource.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/controller/ActBaseClassController.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/controller/ActBaseClassController.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/controller/ActGroupController.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/controller/ActGroupController.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/controller/ActModleTypeController.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/controller/ActModleTypeController.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/controller/PageSequenceController.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/controller/PageSequenceController.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActBaseClassDao.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActBaseClassDao.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActGroupDao.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActGroupDao.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModelDao.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModelDao.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModleTypeDao.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActModleTypeDao.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActUserProcessInstanceIdDao.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/ActUserProcessInstanceIdDao.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/dao/PageSequenceDao.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/dao/PageSequenceDao.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/ActBaseClassService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/ActBaseClassService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/ActGroupService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/ActGroupService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/ActModleTypeService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/ActModleTypeService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/PageSequenceService.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/PageSequenceService.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActBaseClassServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActBaseClassServiceImpl.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActGroupServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActGroupServiceImpl.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActModleTypeServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/ActModleTypeServiceImpl.java
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
--- a/skyeye-activiti/src/main/resources/mapper/activiti/ActBaseClassMapper.xml
+++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActBaseClassMapper.xml
--- a/skyeye-activiti/src/main/resources/mapper/activiti/ActGroupMapper.xml
+++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActGroupMapper.xml
--- a/skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml
+++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActModelMapper.xml
--- a/skyeye-activiti/src/main/resources/mapper/activiti/ActModleTypeMapper.xml
+++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActModleTypeMapper.xml
--- a/skyeye-activiti/src/main/resources/mapper/activiti/ActUserProcessInstanceIdMapper.xml
+++ b/skyeye-activiti/src/main/resources/mapper/activiti/ActUserProcessInstanceIdMapper.xml
--- a/skyeye-activiti/src/main/resources/mapper/activiti/PageSequenceMapper.xml
+++ b/skyeye-activiti/src/main/resources/mapper/activiti/PageSequenceMapper.xml
--- a/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
+++ b/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
--- a/skyeye-admin-assistant/.gitignore
+++ b/skyeye-admin-assistant/.gitignore
--- a/skyeye-admin-assistant/.project
+++ b/skyeye-admin-assistant/.project
--- a/skyeye-admin-assistant/pom.xml
+++ b/skyeye-admin-assistant/pom.xml
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetPurchaseNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetPurchaseNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetReturnNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetReturnNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetUseNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetUseNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetsArticlesPurchaseNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetsArticlesPurchaseNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetsArticlesUseNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/AssetsArticlesUseNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/ConferenceroomReserveNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/ConferenceroomReserveNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/LicenceBorrowNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/LicenceBorrowNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/LicenceRevertNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/LicenceRevertNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/SealBorrowNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/SealBorrowNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/SealRevertNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/SealRevertNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/listenner/service/VehicleUseNodeListener.java
+++ b/skyeye-admin-assistant/src/main/java/com/listenner/service/VehicleUseNodeListener.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetArticlesPurchaseFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetArticlesPurchaseFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetArticlesUseFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetArticlesUseFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetPurchaseFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetPurchaseFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetReturnFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetReturnFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetUseActivitiFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/AssetUseActivitiFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/ConferenceRoomReserveFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/ConferenceRoomReserveFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/LicenceBorrowFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/LicenceBorrowFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/LicenceRevertFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/LicenceRevertFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/SealBorrowFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/SealBorrowFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/SealRevertFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/SealRevertFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/VehicleUseFactory.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/activitifactory/VehicleUseFactory.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AccidentController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AccidentController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetApplyPurchaseController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetApplyPurchaseController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetApplyReturnController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetApplyReturnController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetApplyUseController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetApplyUseController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesApplyPurchaseController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesApplyPurchaseController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesApplyUseController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesApplyUseController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesTypeController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetArticlesTypeController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetFromController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetFromController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetTypeController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/AssetTypeController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/ConferenceRoomController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/ConferenceRoomController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/ConferenceRoomReserveController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/ConferenceRoomReserveController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/CoverageController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/CoverageController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/InspectionController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/InspectionController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/InsuranceController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/InsuranceController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceApplyBorrowController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceApplyBorrowController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceApplyRevertController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceApplyRevertController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/LicenceController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/MaintenanceController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/MaintenanceController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/MyHasMationController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/MyHasMationController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/OilingController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/OilingController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealApplyBorrowController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealApplyBorrowController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealApplyRevertController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealApplyRevertController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/SealController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/VehicleApplyUseController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/VehicleApplyUseController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/VehicleController.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/controller/VehicleController.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AccidentDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AccidentDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetApplyPurchaseDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetApplyPurchaseDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetApplyReturnDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetApplyReturnDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetApplyUseDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetApplyUseDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesApplyPurchaseDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesApplyPurchaseDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesApplyUseDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesApplyUseDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesTypeDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetArticlesTypeDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetFromDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetFromDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetTypeDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/AssetTypeDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/ConferenceRoomDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/ConferenceRoomDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/ConferenceRoomReserveDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/ConferenceRoomReserveDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/CoverageDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/CoverageDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/InspectionDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/InspectionDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/InsuranceDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/InsuranceDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/LicenceApplyBorrowDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/LicenceApplyBorrowDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/LicenceApplyRevertDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/LicenceApplyRevertDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/LicenceDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/LicenceDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/MaintenanceDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/MaintenanceDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/OilingDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/OilingDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/SealApplyBorrowDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/SealApplyBorrowDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/SealApplyRevertDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/SealApplyRevertDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/SealDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/SealDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/VehicleApplyUseDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/VehicleApplyUseDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/VehicleDao.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/dao/VehicleDao.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AccidentService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AccidentService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetApplyPurchaseService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetApplyPurchaseService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetApplyReturnService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetApplyReturnService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetApplyUseService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetApplyUseService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesApplyPurchaseService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesApplyPurchaseService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesApplyUseService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesApplyUseService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesTypeService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetArticlesTypeService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetFromService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetFromService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetTypeService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/AssetTypeService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/ConferenceRoomReserveService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/ConferenceRoomReserveService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/ConferenceRoomService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/ConferenceRoomService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/CoverageService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/CoverageService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/InspectionService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/InspectionService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/InsuranceService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/InsuranceService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceApplyBorrowService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceApplyBorrowService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceApplyRevertService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceApplyRevertService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/LicenceService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/MaintenanceService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/MaintenanceService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/MyHasMationService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/MyHasMationService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/OilingService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/OilingService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealApplyBorrowService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealApplyBorrowService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealApplyRevertService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealApplyRevertService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/SealService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/VehicleApplyUseService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/VehicleApplyUseService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/VehicleService.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/VehicleService.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AccidentServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AccidentServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyPurchaseServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyPurchaseServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyReturnServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyReturnServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyUseServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetApplyUseServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesApplyPurchaseServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesApplyPurchaseServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesApplyUseServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesApplyUseServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesTypeServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetArticlesTypeServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetFromServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetFromServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetTypeServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/AssetTypeServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/ConferenceRoomReserveServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/ConferenceRoomReserveServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/ConferenceRoomServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/ConferenceRoomServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/CoverageServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/CoverageServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/InspectionServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/InspectionServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/InsuranceServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/InsuranceServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceApplyBorrowServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceApplyBorrowServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceApplyRevertServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceApplyRevertServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/LicenceServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/MaintenanceServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/MaintenanceServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/MyHasMationServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/MyHasMationServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/OilingServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/OilingServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealApplyBorrowServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealApplyBorrowServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealApplyRevertServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealApplyRevertServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/SealServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/VehicleApplyUseServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/VehicleApplyUseServiceImpl.java
--- a/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/VehicleServiceImpl.java
+++ b/skyeye-admin-assistant/src/main/java/com/skyeye/eve/service/impl/VehicleServiceImpl.java
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AccidentMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AccidentMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetApplyPurchaseMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetApplyPurchaseMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetApplyReturnMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetApplyReturnMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetApplyUseMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetApplyUseMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesApplyPurchaseMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesApplyPurchaseMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesApplyUseMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesApplyUseMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesTypeMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetArticlesTypeMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetFromMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetFromMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetTypeMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/AssetTypeMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/ConferenceRoomMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/ConferenceRoomMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/ConferenceRoomReserveMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/ConferenceRoomReserveMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/CoverageMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/CoverageMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/InspectionMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/InspectionMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/InsuranceMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/InsuranceMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/LicenceApplyBorrowMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/LicenceApplyBorrowMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/LicenceApplyRevertMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/LicenceApplyRevertMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/LicenceMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/LicenceMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/MaintenanceMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/MaintenanceMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/OilingMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/OilingMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/SealApplyBorrowMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/SealApplyBorrowMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/SealApplyRevertMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/SealApplyRevertMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/SealMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/SealMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/VehicleApplyUseMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/VehicleApplyUseMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/VehicleMapper.xml
+++ b/skyeye-admin-assistant/src/main/resources/mapper/adminassistant/VehicleMapper.xml
--- a/skyeye-admin-assistant/src/main/resources/reqmapping/mapping/assistant.xml
+++ b/skyeye-admin-assistant/src/main/resources/reqmapping/mapping/assistant.xml
--- a/skyeye-api/.gitignore
+++ b/skyeye-api/.gitignore
--- a/skyeye-api/pom.xml
+++ b/skyeye-api/pom.xml
--- a/skyeye-api/src/main/java/com/skyeye/controller/ApiController.java
+++ b/skyeye-api/src/main/java/com/skyeye/controller/ApiController.java
--- a/skyeye-api/src/main/java/com/skyeye/service/ApiService.java
+++ b/skyeye-api/src/main/java/com/skyeye/service/ApiService.java
--- a/skyeye-api/src/main/java/com/skyeye/service/impl/ApiServiceImpl.java
+++ b/skyeye-api/src/main/java/com/skyeye/service/impl/ApiServiceImpl.java
--- a/skyeye-api/src/main/resources/reqmapping/mapping/api.xml
+++ b/skyeye-api/src/main/resources/reqmapping/mapping/api.xml
--- a/skyeye-checkwork/.gitignore
+++ b/skyeye-checkwork/.gitignore
--- a/skyeye-checkwork/.project
+++ b/skyeye-checkwork/.project
--- a/skyeye-checkwork/pom.xml
+++ b/skyeye-checkwork/pom.xml
--- a/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkBusinessTripNodeListener.java
+++ b/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkBusinessTripNodeListener.java
--- a/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkCancelLeaveNodeListener.java
+++ b/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkCancelLeaveNodeListener.java
--- a/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkLeaveNodeListener.java
+++ b/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkLeaveNodeListener.java
--- a/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkOvertimeNodeListener.java
+++ b/skyeye-checkwork/src/main/java/com/listenner/service/CheckWorkOvertimeNodeListener.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkBusinessTripFactory.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkBusinessTripFactory.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkCancelLeaveFactory.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkCancelLeaveFactory.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkLeaveFactory.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkLeaveFactory.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkOvertimeFactory.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/activitifactory/CheckWorkOvertimeFactory.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkBusinessTripController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkBusinessTripController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkCancelLeaveController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkCancelLeaveController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkLeaveController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkLeaveController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkOvertimeController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkOvertimeController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkReasonController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkReasonController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkTimeController.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/controller/CheckWorkTimeController.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkBusinessTripDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkBusinessTripDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkCancelLeaveDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkCancelLeaveDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkLeaveDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkLeaveDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkOvertimeDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkOvertimeDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkReasonDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkReasonDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkTimeDao.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/dao/CheckWorkTimeDao.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkBusinessTripService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkBusinessTripService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkCancelLeaveService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkCancelLeaveService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkLeaveService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkLeaveService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkOvertimeService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkOvertimeService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkReasonService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkReasonService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkTimeService.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/CheckWorkTimeService.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkBusinessTripServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkBusinessTripServiceImpl.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkCancelLeaveServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkCancelLeaveServiceImpl.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkLeaveServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkLeaveServiceImpl.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkOvertimeServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkOvertimeServiceImpl.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkReasonServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkReasonServiceImpl.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkServiceImpl.java
--- a/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkTimeServiceImpl.java
+++ b/skyeye-checkwork/src/main/java/com/skyeye/eve/service/impl/CheckWorkTimeServiceImpl.java
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkBusinessTripMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkBusinessTripMapper.xml
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkCancelLeaveMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkCancelLeaveMapper.xml
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkLeaveMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkLeaveMapper.xml
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkMapper.xml
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkOvertimeMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkOvertimeMapper.xml
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkReasonMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkReasonMapper.xml
--- a/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkTimeMapper.xml
+++ b/skyeye-checkwork/src/main/resources/mapper/checkwork/CheckWorkTimeMapper.xml
--- a/skyeye-checkwork/src/main/resources/reqmapping/mapping/checkwork.xml
+++ b/skyeye-checkwork/src/main/resources/reqmapping/mapping/checkwork.xml
--- a/skyeye-code-doc/.gitignore
+++ b/skyeye-code-doc/.gitignore
--- a/skyeye-code-doc/.project
+++ b/skyeye-code-doc/.project
--- a/skyeye-code-doc/pom.xml
+++ b/skyeye-code-doc/pom.xml
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/CodeModelController.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/CodeModelController.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/CodeModelGroupController.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/CodeModelGroupController.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/CodeModelHistoryController.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/CodeModelHistoryController.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/SysDeveLopDocController.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/controller/SysDeveLopDocController.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/CodeModelDao.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/CodeModelDao.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/CodeModelGroupDao.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/CodeModelGroupDao.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/CodeModelHistoryDao.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/CodeModelHistoryDao.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/SysDeveLopDocDao.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/dao/SysDeveLopDocDao.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/CodeModelGroupService.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/CodeModelGroupService.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/CodeModelHistoryService.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/CodeModelHistoryService.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/CodeModelService.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/CodeModelService.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/SysDeveLopDocService.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/SysDeveLopDocService.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelGroupServiceImpl.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelGroupServiceImpl.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelHistoryServiceImpl.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelHistoryServiceImpl.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelServiceImpl.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/CodeModelServiceImpl.java
--- a/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/SysDeveLopDocServiceImpl.java
+++ b/skyeye-code-doc/src/main/java/com/skyeye/eve/service/impl/SysDeveLopDocServiceImpl.java
--- a/skyeye-promote/skyeye-web/src/main/resources/dbmapper/CodeModelGroupMapper.xml
+++ b/skyeye-promote/skyeye-web/src/main/resources/dbmapper/CodeModelGroupMapper.xml
--- a/skyeye-promote/skyeye-web/src/main/resources/dbmapper/CodeModelHistoryMapper.xml
+++ b/skyeye-promote/skyeye-web/src/main/resources/dbmapper/CodeModelHistoryMapper.xml
--- a/skyeye-promote/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml
+++ b/skyeye-promote/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml
--- a/skyeye-code-doc/src/main/resources/mapper/codedoc/SysDeveLopDocMapper.xml
+++ b/skyeye-code-doc/src/main/resources/mapper/codedoc/SysDeveLopDocMapper.xml
--- a/skyeye-code-doc/src/main/resources/reqmapping/mapping/codedoc.xml
+++ b/skyeye-code-doc/src/main/resources/reqmapping/mapping/codedoc.xml
--- a/skyeye-common/.gitignore
+++ b/skyeye-common/.gitignore
--- a/skyeye-common/.project
+++ b/skyeye-common/.project
--- a/skyeye-common/lib/protobuf-java-2.5.0.jar
+++ b/skyeye-common/lib/protobuf-java-2.5.0.jar
--- a/skyeye-common/pom.xml
+++ b/skyeye-common/pom.xml
--- a/skyeye-common/src/main/java/com/skyeye/annotation/api/ApiEntityColumn.java
+++ b/skyeye-common/src/main/java/com/skyeye/annotation/api/ApiEntityColumn.java
--- a/skyeye-common/src/main/java/com/skyeye/annotation/transaction/ActivitiAndBaseTransaction.java
+++ b/skyeye-common/src/main/java/com/skyeye/annotation/transaction/ActivitiAndBaseTransaction.java
--- a/skyeye-common/src/main/java/com/skyeye/cache/local/LocalCacheMap.java
+++ b/skyeye-common/src/main/java/com/skyeye/cache/local/LocalCacheMap.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/ActivitiConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/AdminAssistantConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/AdminAssistantConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/CheckType.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/CheckType.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/CheckWorkConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/CheckWorkConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/Constants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/Constants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/CrmConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/CrmConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/DiskCloudConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/DiskCloudConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/ErpConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/ErpConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/ForumConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/ForumConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/KnowlgConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/KnowlgConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/Md2FileConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/Md2FileConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/MessageConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/MessageConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/MqConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/MqConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/NoteConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/NoteConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/OrganizationConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/OrganizationConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/ProConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/ProConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/QuType.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/QuType.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/QuartzConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/QuartzConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/RmProGramConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/RmProGramConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/SocketConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/SocketConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/constans/WorkPlanConstants.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/constans/WorkPlanConstants.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/GetRequestJsonUtils.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/GetRequestJsonUtils.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/GetUserToken.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/GetUserToken.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/InputObject.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/InputObject.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/MessageEntity.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/MessageEntity.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/ObjectConstant.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/ObjectConstant.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/OutputObject.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/OutputObject.java
--- a/skyeye-common/src/main/java/com/skyeye/common/object/PutObject.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/object/PutObject.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/AreaUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/AreaUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/BarCodeUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/BarCodeUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/BytesUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/BytesUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/CalculationUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/CalculationUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/DateUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/DateUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/ExcelUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/ExcelUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/FileUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/FileUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/HttpClient.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/HttpClient.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/IPEntry.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/IPEntry.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/IPSeeker.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/IPSeeker.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/IdWorker.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/IdWorker.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/IntervalUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/IntervalUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/MailUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/MailUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/SensitiveWordInit.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/SensitiveWordInit.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/SensitivewordEngine.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/SensitivewordEngine.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/ShowMail.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/ShowMail.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/SpringUtils.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/SpringUtils.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/ToolUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/ToolUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/Utils.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/Utils.java
--- a/skyeye-common/src/main/java/com/skyeye/common/util/XssUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/common/util/XssUtil.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/controller/SysEnclosureController.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/controller/SysEnclosureController.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/controller/SystemFoundationSettingsController.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/controller/SystemFoundationSettingsController.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/dao/SysEnclosureDao.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/dao/SysEnclosureDao.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/dao/SystemFoundationSettingsDao.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/dao/SystemFoundationSettingsDao.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/service/SystemFoundationSettingsService.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/service/SystemFoundationSettingsService.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java
--- a/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java
+++ b/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SystemFoundationSettingsServiceImpl.java
--- a/skyeye-common/src/main/java/com/skyeye/exception/CustomException.java
+++ b/skyeye-common/src/main/java/com/skyeye/exception/CustomException.java
--- a/skyeye-common/src/main/java/com/skyeye/jedis/JedisClientService.java
+++ b/skyeye-common/src/main/java/com/skyeye/jedis/JedisClientService.java
--- a/skyeye-common/src/main/java/com/skyeye/jedis/impl/JedisClientServiceImpl.java
+++ b/skyeye-common/src/main/java/com/skyeye/jedis/impl/JedisClientServiceImpl.java
--- a/skyeye-common/src/main/java/com/skyeye/jedis/util/JedisClusterConfig.java
+++ b/skyeye-common/src/main/java/com/skyeye/jedis/util/JedisClusterConfig.java
--- a/skyeye-common/src/main/java/com/skyeye/jedis/util/RedisProperties.java
+++ b/skyeye-common/src/main/java/com/skyeye/jedis/util/RedisProperties.java
--- a/skyeye-common/src/main/java/com/skyeye/push/PhonePushUtil.java
+++ b/skyeye-common/src/main/java/com/skyeye/push/PhonePushUtil.java
--- a/skyeye-common/src/main/resources/mapper/common/SysEnclosureMapper.xml
+++ b/skyeye-common/src/main/resources/mapper/common/SysEnclosureMapper.xml
--- a/skyeye-common/src/main/resources/mapper/common/SystemFoundationSettingsMapper.xml
+++ b/skyeye-common/src/main/resources/mapper/common/SystemFoundationSettingsMapper.xml
--- a/skyeye-common/src/main/resources/qqwry.dat
+++ b/skyeye-common/src/main/resources/qqwry.dat
--- a/skyeye-common/src/main/resources/reqmapping/mapping/common.xml
+++ b/skyeye-common/src/main/resources/reqmapping/mapping/common.xml
--- a/skyeye-crm/.gitignore
+++ b/skyeye-crm/.gitignore
--- a/skyeye-crm/.project
+++ b/skyeye-crm/.project
--- a/skyeye-crm/pom.xml
+++ b/skyeye-crm/pom.xml
--- a/skyeye-crm/src/main/java/com/listenner/service/ContractCheckNodeListener.java
+++ b/skyeye-crm/src/main/java/com/listenner/service/ContractCheckNodeListener.java
--- a/skyeye-crm/src/main/java/com/listenner/service/OpportunityTypeOneNodeListener.java
+++ b/skyeye-crm/src/main/java/com/listenner/service/OpportunityTypeOneNodeListener.java
--- a/skyeye-crm/src/main/java/com/skyeye/activitifactory/CrmContractFactory.java
+++ b/skyeye-crm/src/main/java/com/skyeye/activitifactory/CrmContractFactory.java
--- a/skyeye-crm/src/main/java/com/skyeye/activitifactory/CrmOpportunityFactory.java
+++ b/skyeye-crm/src/main/java/com/skyeye/activitifactory/CrmOpportunityFactory.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmContractController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmContractController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerContactController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerContactController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerFromController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerFromController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerGroupController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerGroupController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerIndustryController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerIndustryController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerTypeController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmCustomerTypeController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmDocumentaryController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmDocumentaryController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmDocumentaryTypeController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmDocumentaryTypeController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmOpportunityController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmOpportunityController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CrmOpportunityFromController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CrmOpportunityFromController.java
--- a/skyeye-crm/src/main/java/com/skyeye/controller/CustomerController.java
+++ b/skyeye-crm/src/main/java/com/skyeye/controller/CustomerController.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmContractDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmContractDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerContactDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerContactDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerFromDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerFromDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerGroupDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerGroupDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerIndustryDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerIndustryDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerTypeDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmCustomerTypeDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmDocumentaryDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmDocumentaryDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmDocumentaryTypeDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmDocumentaryTypeDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmOpportunityChangeHistoryDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmOpportunityChangeHistoryDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmOpportunityDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmOpportunityDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CrmOpportunityFromDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CrmOpportunityFromDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/dao/CustomerDao.java
+++ b/skyeye-crm/src/main/java/com/skyeye/dao/CustomerDao.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmContractService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmContractService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerContactService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerContactService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerFromService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerFromService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerGroupService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerGroupService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerIndustryService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerIndustryService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerTypeService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmCustomerTypeService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmDocumentaryService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmDocumentaryService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmDocumentaryTypeService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmDocumentaryTypeService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmOpportunityFromService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmOpportunityFromService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CrmOpportunityService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CrmOpportunityService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/CustomerService.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/CustomerService.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmContractServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmContractServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerContactServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerContactServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerFromServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerFromServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerGroupServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerGroupServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerIndustryServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerIndustryServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerTypeServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmCustomerTypeServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmDocumentaryServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmDocumentaryServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmDocumentaryTypeServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmDocumentaryTypeServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmOpportunityFromServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmOpportunityFromServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmOpportunityServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CrmOpportunityServiceImpl.java
--- a/skyeye-crm/src/main/java/com/skyeye/service/impl/CustomerServiceImpl.java
+++ b/skyeye-crm/src/main/java/com/skyeye/service/impl/CustomerServiceImpl.java
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmContractMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmContractMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerContactMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerContactMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerFromMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerFromMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerGroupMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerGroupMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerIndustryMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerIndustryMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerTypeMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmCustomerTypeMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmDocumentaryMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmDocumentaryMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmDocumentaryTypeMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmDocumentaryTypeMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmOpportunityChangeHistoryMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmOpportunityChangeHistoryMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmOpportunityFromMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmOpportunityFromMapper.xml
--- a/skyeye-crm/src/main/resources/mapper/crm/CrmOpportunityMapper.xml
+++ b/skyeye-crm/src/main/resources/mapper/crm/CrmOpportunityMapper.xml
--- a/skyeye-crm/src/main/resources/reqmapping/mapping/crm.xml
+++ b/skyeye-crm/src/main/resources/reqmapping/mapping/crm.xml
--- a/skyeye-disk-cloud/.gitignore
+++ b/skyeye-disk-cloud/.gitignore
--- a/skyeye-disk-cloud/.project
+++ b/skyeye-disk-cloud/.project
--- a/skyeye-disk-cloud/lib/epublib-core-latest.jar
+++ b/skyeye-disk-cloud/lib/epublib-core-latest.jar
--- a/skyeye-disk-cloud/pom.xml
+++ b/skyeye-disk-cloud/pom.xml
--- a/skyeye-disk-cloud/src/main/java/com/skyeye/eve/controller/FileConsoleController.java
+++ b/skyeye-disk-cloud/src/main/java/com/skyeye/eve/controller/FileConsoleController.java
--- a/skyeye-disk-cloud/src/main/java/com/skyeye/eve/dao/FileConsoleDao.java
+++ b/skyeye-disk-cloud/src/main/java/com/skyeye/eve/dao/FileConsoleDao.java
--- a/skyeye-disk-cloud/src/main/java/com/skyeye/eve/service/FileConsoleService.java
+++ b/skyeye-disk-cloud/src/main/java/com/skyeye/eve/service/FileConsoleService.java
--- a/skyeye-disk-cloud/src/main/java/com/skyeye/eve/service/impl/FileConsoleServiceImpl.java
+++ b/skyeye-disk-cloud/src/main/java/com/skyeye/eve/service/impl/FileConsoleServiceImpl.java
--- a/skyeye-disk-cloud/src/main/resources/mapper/diskcloud/FileConsoleMapper.xml
+++ b/skyeye-disk-cloud/src/main/resources/mapper/diskcloud/FileConsoleMapper.xml
--- a/skyeye-disk-cloud/src/main/resources/reqmapping/mapping/diskcloud.xml
+++ b/skyeye-disk-cloud/src/main/resources/reqmapping/mapping/diskcloud.xml
--- a/skyeye-dsform/.gitignore
+++ b/skyeye-dsform/.gitignore
--- a/skyeye-dsform/.project
+++ b/skyeye-dsform/.project
--- a/skyeye-dsform/pom.xml
+++ b/skyeye-dsform/pom.xml
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormContentController.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormContentController.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormDisplayTemplateController.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormDisplayTemplateController.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormLimitRequirementController.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormLimitRequirementController.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormPageController.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/controller/DsFormPageController.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormContentDao.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormContentDao.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormDisplayTemplateDao.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormDisplayTemplateDao.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormLimitRequirementDao.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormLimitRequirementDao.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageDao.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageDao.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormContentService.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormContentService.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormDisplayTemplateService.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormDisplayTemplateService.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormLimitRequirementService.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormLimitRequirementService.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormPageService.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/DsFormPageService.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormContentServiceImpl.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormContentServiceImpl.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormDisplayTemplateServiceImpl.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormDisplayTemplateServiceImpl.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormLimitRequirementServiceImpl.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormLimitRequirementServiceImpl.java
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormPageServiceImpl.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/service/impl/DsFormPageServiceImpl.java
--- a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormContentMapper.xml
+++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormContentMapper.xml
--- a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormDisplayTemplateMapper.xml
+++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormDisplayTemplateMapper.xml
--- a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormLimitRequirementMapper.xml
+++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormLimitRequirementMapper.xml
--- a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageMapper.xml
+++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageMapper.xml
--- a/skyeye-dsform/src/main/resources/reqmapping/mapping/reqdsform.xml
+++ b/skyeye-dsform/src/main/resources/reqmapping/mapping/reqdsform.xml
--- a/skyeye-ehr/.gitignore
+++ b/skyeye-ehr/.gitignore
--- a/skyeye-ehr/.project
+++ b/skyeye-ehr/.project
--- a/skyeye-ehr/pom.xml
+++ b/skyeye-ehr/pom.xml
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffArchivesController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffArchivesController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffCertificateController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffCertificateController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffContractController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffContractController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffDataDictionaryController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffDataDictionaryController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffEducationController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffEducationController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffFamilyController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffFamilyController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffJobResumeController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffJobResumeController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffLanguageController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffLanguageController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffLanguageLevelController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffLanguageLevelController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffRewardPunishController.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/controller/SysStaffRewardPunishController.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffArchivesDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffArchivesDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffCertificateDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffCertificateDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffContractDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffContractDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffDataDictionaryDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffDataDictionaryDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffEducationDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffEducationDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffFamilyDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffFamilyDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffJobResumeDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffJobResumeDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffLanguageDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffLanguageDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffLanguageLevelDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffLanguageLevelDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffRewardPunishDao.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/dao/SysStaffRewardPunishDao.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffArchivesService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffArchivesService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffCertificateService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffCertificateService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffContractService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffContractService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffDataDictionaryService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffDataDictionaryService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffEducationService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffEducationService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffFamilyService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffFamilyService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffJobResumeService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffJobResumeService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffLanguageLevelService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffLanguageLevelService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffLanguageService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffLanguageService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffRewardPunishService.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/SysStaffRewardPunishService.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffArchivesServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffCertificateServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffContractServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffDataDictionaryServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffDataDictionaryServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffEducationServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffFamilyServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffJobResumeServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageLevelServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageLevelServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffLanguageServiceImpl.java
--- a/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java
+++ b/skyeye-ehr/src/main/java/com/skyeye/eve/service/impl/SysStaffRewardPunishServiceImpl.java
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffArchivesMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffArchivesMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffCertificateMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffCertificateMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffContractMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffContractMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffDataDictionaryMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffDataDictionaryMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffEducationMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffEducationMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffFamilyMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffFamilyMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffJobResumeMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffJobResumeMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffLanguageLevelMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffLanguageLevelMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffLanguageMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffLanguageMapper.xml
--- a/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffRewardPunishMapper.xml
+++ b/skyeye-ehr/src/main/resources/mapper/ehr/SysStaffRewardPunishMapper.xml
--- a/skyeye-ehr/src/main/resources/reqmapping/mapping/ehr.xml
+++ b/skyeye-ehr/src/main/resources/reqmapping/mapping/ehr.xml
--- a/skyeye-email/.gitignore
+++ b/skyeye-email/.gitignore
--- a/skyeye-email/.project
+++ b/skyeye-email/.project
--- a/skyeye-email/pom.xml
+++ b/skyeye-email/pom.xml
--- a/skyeye-email/src/main/java/com/skyeye/eve/controller/UserEmailController.java
+++ b/skyeye-email/src/main/java/com/skyeye/eve/controller/UserEmailController.java
--- a/skyeye-email/src/main/java/com/skyeye/eve/dao/UserEmailDao.java
+++ b/skyeye-email/src/main/java/com/skyeye/eve/dao/UserEmailDao.java
--- a/skyeye-email/src/main/java/com/skyeye/eve/service/UserEmailService.java
+++ b/skyeye-email/src/main/java/com/skyeye/eve/service/UserEmailService.java
--- a/skyeye-email/src/main/java/com/skyeye/eve/service/impl/UserEmailServiceImpl.java
+++ b/skyeye-email/src/main/java/com/skyeye/eve/service/impl/UserEmailServiceImpl.java
--- a/skyeye-email/src/main/resources/mapper/email/UserEmailMapper.xml
+++ b/skyeye-email/src/main/resources/mapper/email/UserEmailMapper.xml
--- a/skyeye-email/src/main/resources/reqmapping/mapping/email.xml
+++ b/skyeye-email/src/main/resources/reqmapping/mapping/email.xml
--- a/skyeye-entity/pom.xml
+++ b/skyeye-entity/pom.xml
--- a/skyeye-entity/src/main/java/com/skyeye/eve/entity/quartz/SysQuartz.java
+++ b/skyeye-entity/src/main/java/com/skyeye/eve/entity/quartz/SysQuartz.java
--- a/skyeye-entity/src/main/java/com/skyeye/eve/entity/quartz/SysQuartzRunHistory.java
+++ b/skyeye-entity/src/main/java/com/skyeye/eve/entity/quartz/SysQuartzRunHistory.java
--- a/skyeye-entity/target/maven-archiver/pom.properties
+++ b/skyeye-entity/target/maven-archiver/pom.properties
--- a/docs/.keep
+++ b/docs/.keep
--- a/skyeye-entity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/skyeye-entity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
--- a/skyeye-entity/target/skyeye-entity-0.0.1-SNAPSHOT.jar
+++ b/skyeye-entity/target/skyeye-entity-0.0.1-SNAPSHOT.jar
--- a/skyeye-erp-produce/.gitignore
+++ b/skyeye-erp-produce/.gitignore
--- a/skyeye-erp-produce/.project
+++ b/skyeye-erp-produce/.project
--- a/skyeye-erp-produce/pom.xml
+++ b/skyeye-erp-produce/pom.xml
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpBomController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpBomController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpDepartStockController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpDepartStockController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpFarmController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpFarmController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpMachinController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpMachinController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpPickController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpPickController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpProductionController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpProductionController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpWayProcedureController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpWayProcedureController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpWorkProcedureController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpWorkProcedureController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpWorkProcedureTypeController.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/controller/ErpWorkProcedureTypeController.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpBomDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpBomDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpDepartStockDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpDepartStockDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpFarmDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpFarmDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpMachinDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpMachinDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpPickDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpPickDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpProductionDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpProductionDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWayProcedureDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWayProcedureDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWorkProcedureDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWorkProcedureDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWorkProcedureOperatorDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWorkProcedureOperatorDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWorkProcedureTypeDao.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/dao/ErpWorkProcedureTypeDao.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpBomService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpBomService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpDepartStockService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpDepartStockService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpFarmService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpFarmService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpMachinService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpMachinService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpPickService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpPickService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpProductionService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpProductionService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpWayProcedureService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpWayProcedureService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpWorkProcedureService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpWorkProcedureService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpWorkProcedureTypeService.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/ErpWorkProcedureTypeService.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpBomServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpBomServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpDepartStockServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpDepartStockServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpFarmServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpFarmServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpMachinServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpMachinServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpPickServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpPickServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpProductionServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpProductionServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpWayProcedureServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpWayProcedureServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpWorkProcedureServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpWorkProcedureServiceImpl.java
--- a/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpWorkProcedureTypeServiceImpl.java
+++ b/skyeye-erp-produce/src/main/java/com/skyeye/service/impl/ErpWorkProcedureTypeServiceImpl.java
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpBomMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpBomMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpDepartStockMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpDepartStockMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpFarmMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpFarmMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpMachinMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpMachinMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpPickMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpPickMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpProductionMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpProductionMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWayProcedureMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWayProcedureMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWorkProcedureMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWorkProcedureMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWorkProcedureOperatorMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWorkProcedureOperatorMapper.xml
--- a/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWorkProcedureTypeMapper.xml
+++ b/skyeye-erp-produce/src/main/resources/mapper/produce/ErpWorkProcedureTypeMapper.xml
--- a/skyeye-erp-produce/src/main/resources/reqmapping/mapping/produce.xml
+++ b/skyeye-erp-produce/src/main/resources/reqmapping/mapping/produce.xml
--- a/skyeye-erp/.gitignore
+++ b/skyeye-erp/.gitignore
--- a/skyeye-erp/.project
+++ b/skyeye-erp/.project
--- a/skyeye-erp/pom.xml
+++ b/skyeye-erp/pom.xml
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/OtherOutLetsActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/OtherOutLetsActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/OtherWareHousActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/OtherWareHousActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/PurchaseOrderActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/PurchaseOrderActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/PurchasePutActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/PurchasePutActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/PurchaseReturnsActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/PurchaseReturnsActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/RetailOutLetActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/RetailOutLetActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/RetailReturnsActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/RetailReturnsActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/SalesOrderActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/SalesOrderActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/SalesOutLetActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/SalesOutLetActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/activitifactory/SalesReturnsActivitiFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/activitifactory/SalesReturnsActivitiFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/AccountController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/AccountController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/AllocationController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/AllocationController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/AssemblySheetController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/AssemblySheetController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/ErpCommonController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/ErpCommonController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/ErpOrderSaleOverPlanController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/ErpOrderSaleOverPlanController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/ErpStockInventoryController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/ErpStockInventoryController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/InoutitemController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/InoutitemController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/MaterialCategoryController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/MaterialCategoryController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/MaterialController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/MaterialController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/MaterialUnitController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/MaterialUnitController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/MemberController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/MemberController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/OtherOutLetsController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/OtherOutLetsController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/OtherWareHousController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/OtherWareHousController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/PurchaseOrderController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/PurchaseOrderController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/PurchasePutController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/PurchasePutController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/PurchaseReturnsController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/PurchaseReturnsController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/RetailOutLetController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/RetailOutLetController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/RetailReturnsController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/RetailReturnsController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/SalesOrderController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/SalesOrderController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/SalesOutLetController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/SalesOutLetController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/SalesReturnsController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/SalesReturnsController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/SplitListController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/SplitListController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/StatisticsController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/StatisticsController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/StoreHouseApprovalController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/StoreHouseApprovalController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/StoreHouseController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/StoreHouseController.java
--- a/skyeye-erp/src/main/java/com/skyeye/controller/SupplierController.java
+++ b/skyeye-erp/src/main/java/com/skyeye/controller/SupplierController.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/AccountDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/AccountDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/AllocationDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/AllocationDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/AssemblySheetDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/AssemblySheetDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/ErpCommonDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/ErpCommonDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/ErpOrderSaleOverPlanDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/ErpOrderSaleOverPlanDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/ErpStockInventoryDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/ErpStockInventoryDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/InoutitemDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/InoutitemDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/MaterialCategoryDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/MaterialCategoryDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/MaterialDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/MaterialDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/MaterialUnitDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/MaterialUnitDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/MemberDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/MemberDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/OtherOutLetsDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/OtherOutLetsDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/OtherWareHousDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/OtherWareHousDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/PurchaseOrderDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/PurchaseOrderDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/PurchasePutDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/PurchasePutDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/PurchaseReturnsDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/PurchaseReturnsDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/RetailOutLetDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/RetailOutLetDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/RetailReturnsDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/RetailReturnsDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/SalesOrderDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/SalesOrderDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/SalesOutLetDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/SalesOutLetDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/SalesReturnsDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/SalesReturnsDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/SplitListDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/SplitListDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/StatisticsDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/StatisticsDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/StoreHouseApprovalDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/StoreHouseApprovalDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/StoreHouseDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/StoreHouseDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/dao/SupplierDao.java
+++ b/skyeye-erp/src/main/java/com/skyeye/dao/SupplierDao.java
--- a/skyeye-erp/src/main/java/com/skyeye/erp/entity/EditMaterialNormsObject.java
+++ b/skyeye-erp/src/main/java/com/skyeye/erp/entity/EditMaterialNormsObject.java
--- a/skyeye-erp/src/main/java/com/skyeye/erp/entity/TransmitObject.java
+++ b/skyeye-erp/src/main/java/com/skyeye/erp/entity/TransmitObject.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/ErpOrderFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/ErpOrderFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/ErpOrderFactoryResult.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/ErpOrderFactoryResult.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/ErpRunFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/ErpRunFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/OtherOutLetsFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/OtherOutLetsFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/OtherWareHousFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/OtherWareHousFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/PurchaseOrderFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/PurchaseOrderFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/PurchasePutFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/PurchasePutFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/PurchaseReturnsFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/PurchaseReturnsFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/RetailOutLetFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/RetailOutLetFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/RetailReturnsFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/RetailReturnsFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/SalesOrderFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/SalesOrderFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/SalesOutLetFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/SalesOutLetFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/factory/impl/SalesReturnsFactory.java
+++ b/skyeye-erp/src/main/java/com/skyeye/factory/impl/SalesReturnsFactory.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/OtherOutLetsNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/OtherOutLetsNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/OtherWareHousNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/OtherWareHousNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/PurchaseOrderNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/PurchaseOrderNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/PurchasePutNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/PurchasePutNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/PurchaseReturnsNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/PurchaseReturnsNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/RetailOutLetNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/RetailOutLetNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/RetailReturnsNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/RetailReturnsNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/SalesOrderNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/SalesOrderNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/SalesOutLetNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/SalesOutLetNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/listenner/SalesReturnsNodeListenner.java
+++ b/skyeye-erp/src/main/java/com/skyeye/listenner/SalesReturnsNodeListenner.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/AccountService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/AccountService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/AllocationService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/AllocationService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/AssemblySheetService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/AssemblySheetService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/ErpCommonService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/ErpCommonService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/ErpOrderSaleOverPlanService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/ErpOrderSaleOverPlanService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/ErpStockInventoryService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/ErpStockInventoryService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/InoutitemService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/InoutitemService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/MaterialCategoryService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/MaterialCategoryService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/MaterialService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/MaterialService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/MaterialUnitService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/MaterialUnitService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/MemberService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/MemberService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/OtherOutLetsService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/OtherOutLetsService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/OtherWareHousService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/OtherWareHousService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/PurchaseOrderService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/PurchaseOrderService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/PurchasePutService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/PurchasePutService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/PurchaseReturnsService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/PurchaseReturnsService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/RetailOutLetService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/RetailOutLetService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/RetailReturnsService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/RetailReturnsService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/SalesOrderService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/SalesOrderService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/SalesOutLetService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/SalesOutLetService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/SalesReturnsService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/SalesReturnsService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/SplitListService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/SplitListService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/StatisticsService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/StatisticsService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/StoreHouseApprovalService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/StoreHouseApprovalService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/StoreHouseService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/StoreHouseService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/SupplierService.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/SupplierService.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/AllocationServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/AllocationServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/AssemblySheetServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/AssemblySheetServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/ErpCommonServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/ErpCommonServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/ErpOrderSaleOverPlanServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/ErpOrderSaleOverPlanServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/ErpStockInventoryServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/ErpStockInventoryServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/InoutitemServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/InoutitemServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/MaterialCategoryServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/MaterialCategoryServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/MaterialServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/MaterialServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/MaterialUnitServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/MaterialUnitServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/MemberServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/OtherOutLetsServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/OtherOutLetsServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/OtherWareHousServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/OtherWareHousServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/PurchaseOrderServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/PurchaseOrderServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/PurchasePutServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/PurchasePutServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/PurchaseReturnsServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/PurchaseReturnsServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/RetailOutLetServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/RetailOutLetServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/RetailReturnsServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/RetailReturnsServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/SalesOrderServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/SalesOrderServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/SalesOutLetServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/SalesOutLetServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/SalesReturnsServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/SalesReturnsServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/SplitListServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/SplitListServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/StatisticsServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/StatisticsServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/StoreHouseApprovalServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/StoreHouseApprovalServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/StoreHouseServiceImpl.java
--- a/skyeye-erp/src/main/java/com/skyeye/service/impl/SupplierServiceImpl.java
+++ b/skyeye-erp/src/main/java/com/skyeye/service/impl/SupplierServiceImpl.java
--- a/skyeye-erp/src/main/resources/mapper/erp/AccountMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/AccountMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/AllocationMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/AllocationMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/AssemblySheetMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/AssemblySheetMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/ErpCommonMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/ErpCommonMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/ErpOrderSaleOverPlanMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/ErpOrderSaleOverPlanMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/ErpStockInventoryMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/ErpStockInventoryMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/InoutitemMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/InoutitemMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/MaterialCategoryMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/MaterialCategoryMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/MaterialMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/MaterialMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/MaterialUnitMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/MaterialUnitMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/MemberMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/MemberMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/OtherOutLetsMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/OtherOutLetsMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/OtherWareHousMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/OtherWareHousMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/PurchaseOrderMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/PurchaseOrderMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/PurchasePutMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/PurchasePutMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/PurchaseReturnsMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/PurchaseReturnsMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/RetailOutLetMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/RetailOutLetMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/RetailReturnsMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/RetailReturnsMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/SalesOrderMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/SalesOrderMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/SalesOutLetMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/SalesOutLetMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/SalesReturnsMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/SalesReturnsMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/SplitListMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/SplitListMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/StatisticsMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/StatisticsMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/StoreHouseApprovalMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/StoreHouseApprovalMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/StoreHouseMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/StoreHouseMapper.xml
--- a/skyeye-erp/src/main/resources/mapper/erp/SupplierMapper.xml
+++ b/skyeye-erp/src/main/resources/mapper/erp/SupplierMapper.xml
--- a/skyeye-erp/src/main/resources/reqmapping/mapping/erp.xml
+++ b/skyeye-erp/src/main/resources/reqmapping/mapping/erp.xml
--- a/skyeye-exam/.gitignore
+++ b/skyeye-exam/.gitignore
--- a/skyeye-exam/.project
+++ b/skyeye-exam/.project
--- a/skyeye-exam/pom.xml
+++ b/skyeye-exam/pom.xml
--- a/skyeye-exam/src/main/java/com/skyeye/eve/controller/ExamController.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/controller/ExamController.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/controller/SchoolQuestionBankController.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/controller/SchoolQuestionBankController.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/dao/ExamDao.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/dao/ExamDao.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/dao/SchoolQuestionBankDao.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/dao/SchoolQuestionBankDao.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/service/ExamService.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/service/ExamService.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/service/SchoolQuestionBankService.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/service/SchoolQuestionBankService.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/service/impl/ExamServiceImpl.java
--- a/skyeye-exam/src/main/java/com/skyeye/eve/service/impl/SchoolQuestionBankServiceImpl.java
+++ b/skyeye-exam/src/main/java/com/skyeye/eve/service/impl/SchoolQuestionBankServiceImpl.java
--- a/skyeye-exam/src/main/resources/mapper/exam/ExamMapper.xml
+++ b/skyeye-exam/src/main/resources/mapper/exam/ExamMapper.xml
--- a/skyeye-exam/src/main/resources/mapper/exam/SchoolQuestionBankMapper.xml
+++ b/skyeye-exam/src/main/resources/mapper/exam/SchoolQuestionBankMapper.xml
--- a/skyeye-exam/src/main/resources/reqmapping/mapping/exam.xml
+++ b/skyeye-exam/src/main/resources/reqmapping/mapping/exam.xml
--- a/skyeye-forum/.gitignore
+++ b/skyeye-forum/.gitignore
--- a/skyeye-forum/.project
+++ b/skyeye-forum/.project
--- a/skyeye-forum/pom.xml
+++ b/skyeye-forum/pom.xml
--- a/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumContentController.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumContentController.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumReportController.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumReportController.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumSensitiveWordsController.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumSensitiveWordsController.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumTagController.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/controller/ForumTagController.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/controller/ReportTypeController.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/controller/ReportTypeController.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumContentDao.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumContentDao.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumReportDao.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumReportDao.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumSensitiveWordsDao.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumSensitiveWordsDao.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumTagDao.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/dao/ForumTagDao.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/dao/ReportTypeDao.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/dao/ReportTypeDao.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumContentService.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumContentService.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumReportService.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumReportService.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumSensitiveWordsService.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumSensitiveWordsService.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumTagService.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/ForumTagService.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/ReportTypeService.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/ReportTypeService.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumContentServiceImpl.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumContentServiceImpl.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumReportServiceImpl.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumReportServiceImpl.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumSensitiveWordsServiceImpl.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumSensitiveWordsServiceImpl.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumTagServiceImpl.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ForumTagServiceImpl.java
--- a/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ReportTypeServiceImpl.java
+++ b/skyeye-forum/src/main/java/com/skyeye/eve/service/impl/ReportTypeServiceImpl.java
--- a/skyeye-forum/src/main/resources/mapper/forum/ForumContentMapper.xml
+++ b/skyeye-forum/src/main/resources/mapper/forum/ForumContentMapper.xml
--- a/skyeye-forum/src/main/resources/mapper/forum/ForumReportMapper.xml
+++ b/skyeye-forum/src/main/resources/mapper/forum/ForumReportMapper.xml
--- a/skyeye-forum/src/main/resources/mapper/forum/ForumSensitiveWordsMapper.xml
+++ b/skyeye-forum/src/main/resources/mapper/forum/ForumSensitiveWordsMapper.xml
--- a/skyeye-forum/src/main/resources/mapper/forum/ForumTagMapper.xml
+++ b/skyeye-forum/src/main/resources/mapper/forum/ForumTagMapper.xml
--- a/skyeye-forum/src/main/resources/mapper/forum/ReportTypeMapper.xml
+++ b/skyeye-forum/src/main/resources/mapper/forum/ReportTypeMapper.xml
--- a/skyeye-forum/src/main/resources/reqmapping/mapping/forum.xml
+++ b/skyeye-forum/src/main/resources/reqmapping/mapping/forum.xml
--- a/skyeye-gateway/.gitignore
+++ b/skyeye-gateway/.gitignore
--- a/skyeye-gateway/.project
+++ b/skyeye-gateway/.project
--- a/skyeye-gateway/pom.xml
+++ b/skyeye-gateway/pom.xml
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/controller/CrmPageController.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/controller/CrmPageController.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/controller/ErpPageController.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/controller/ErpPageController.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/controller/ErpProducePageController.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/controller/ErpProducePageController.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/controller/MainPageController.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/controller/MainPageController.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/dao/CrmPageDao.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/dao/CrmPageDao.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/dao/ErpPageDao.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/dao/ErpPageDao.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/dao/ErpProducePageDao.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/dao/ErpProducePageDao.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/dao/MainPageDao.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/dao/MainPageDao.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/CrmPageService.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/CrmPageService.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/ErpPageService.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/ErpPageService.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/ErpProducePageService.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/ErpProducePageService.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/MainPageService.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/MainPageService.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/CrmPageServiceImpl.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/CrmPageServiceImpl.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/ErpPageServiceImpl.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/ErpPageServiceImpl.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/ErpProducePageServiceImpl.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/ErpProducePageServiceImpl.java
--- a/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/MainPageServiceImpl.java
+++ b/skyeye-gateway/src/main/java/com/skyeye/eve/service/impl/MainPageServiceImpl.java
--- a/skyeye-gateway/src/main/resources/mapper/gateway/CrmPageMapper.xml
+++ b/skyeye-gateway/src/main/resources/mapper/gateway/CrmPageMapper.xml
--- a/skyeye-gateway/src/main/resources/mapper/gateway/ErpPageMapper.xml
+++ b/skyeye-gateway/src/main/resources/mapper/gateway/ErpPageMapper.xml
--- a/skyeye-gateway/src/main/resources/mapper/gateway/ErpProduceMapper.xml
+++ b/skyeye-gateway/src/main/resources/mapper/gateway/ErpProduceMapper.xml
--- a/skyeye-gateway/src/main/resources/mapper/gateway/MainPageMapper.xml
+++ b/skyeye-gateway/src/main/resources/mapper/gateway/MainPageMapper.xml
--- a/skyeye-gateway/src/main/resources/reqmapping/mapping/gateway.xml
+++ b/skyeye-gateway/src/main/resources/reqmapping/mapping/gateway.xml
--- a/skyeye-ifs/pom.xml
+++ b/skyeye-ifs/pom.xml
--- a/skyeye-ifs/src/main/java/com/skyeye/controller/AdvanceChargeController.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/controller/AdvanceChargeController.java
--- a/skyeye-ifs/src/main/java/com/skyeye/controller/ExpenditureController.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/controller/ExpenditureController.java
--- a/skyeye-ifs/src/main/java/com/skyeye/controller/IncomeController.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/controller/IncomeController.java
--- a/skyeye-ifs/src/main/java/com/skyeye/controller/PayMentController.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/controller/PayMentController.java
--- a/skyeye-ifs/src/main/java/com/skyeye/controller/ReceivablesController.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/controller/ReceivablesController.java
--- a/skyeye-ifs/src/main/java/com/skyeye/controller/TransferController.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/controller/TransferController.java
--- a/skyeye-ifs/src/main/java/com/skyeye/dao/AdvanceChargeDao.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/dao/AdvanceChargeDao.java
--- a/skyeye-ifs/src/main/java/com/skyeye/dao/ExpenditureDao.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/dao/ExpenditureDao.java
--- a/skyeye-ifs/src/main/java/com/skyeye/dao/IncomeDao.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/dao/IncomeDao.java
--- a/skyeye-ifs/src/main/java/com/skyeye/dao/PayMentDao.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/dao/PayMentDao.java
--- a/skyeye-ifs/src/main/java/com/skyeye/dao/ReceivablesDao.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/dao/ReceivablesDao.java
--- a/skyeye-ifs/src/main/java/com/skyeye/dao/TransferDao.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/dao/TransferDao.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/AdvanceChargeService.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/AdvanceChargeService.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/ExpenditureService.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/ExpenditureService.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/IncomeService.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/IncomeService.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/PayMentService.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/PayMentService.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/ReceivablesService.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/ReceivablesService.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/TransferService.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/TransferService.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/impl/AdvanceChargeServiceImpl.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/impl/AdvanceChargeServiceImpl.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/impl/ExpenditureServiceImpl.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/impl/ExpenditureServiceImpl.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/impl/IncomeServiceImpl.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/impl/IncomeServiceImpl.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/impl/PayMentServiceImpl.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/impl/PayMentServiceImpl.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/impl/ReceivablesServiceImpl.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/impl/ReceivablesServiceImpl.java
--- a/skyeye-ifs/src/main/java/com/skyeye/service/impl/TransferServiceImpl.java
+++ b/skyeye-ifs/src/main/java/com/skyeye/service/impl/TransferServiceImpl.java
--- a/skyeye-ifs/src/main/resources/mapper/ifs/AdvanceChargeMapper.xml
+++ b/skyeye-ifs/src/main/resources/mapper/ifs/AdvanceChargeMapper.xml
--- a/skyeye-ifs/src/main/resources/mapper/ifs/ExpenditureMapper.xml
+++ b/skyeye-ifs/src/main/resources/mapper/ifs/ExpenditureMapper.xml
--- a/skyeye-ifs/src/main/resources/mapper/ifs/IncomeMapper.xml
+++ b/skyeye-ifs/src/main/resources/mapper/ifs/IncomeMapper.xml
--- a/skyeye-ifs/src/main/resources/mapper/ifs/PayMentMapper.xml
+++ b/skyeye-ifs/src/main/resources/mapper/ifs/PayMentMapper.xml
--- a/skyeye-ifs/src/main/resources/mapper/ifs/ReceivablesMapper.xml
+++ b/skyeye-ifs/src/main/resources/mapper/ifs/ReceivablesMapper.xml
--- a/skyeye-ifs/src/main/resources/mapper/ifs/TransferMapper.xml
+++ b/skyeye-ifs/src/main/resources/mapper/ifs/TransferMapper.xml
--- a/skyeye-ifs/src/main/resources/reqmapping/mapping/ifs.xml
+++ b/skyeye-ifs/src/main/resources/reqmapping/mapping/ifs.xml
--- a/skyeye-jobdiary/.gitignore
+++ b/skyeye-jobdiary/.gitignore
--- a/skyeye-jobdiary/.project
+++ b/skyeye-jobdiary/.project
--- a/skyeye-jobdiary/pom.xml
+++ b/skyeye-jobdiary/pom.xml
--- a/skyeye-jobdiary/src/main/java/com/skyeye/eve/controller/JobDiaryController.java
+++ b/skyeye-jobdiary/src/main/java/com/skyeye/eve/controller/JobDiaryController.java
--- a/skyeye-jobdiary/src/main/java/com/skyeye/eve/dao/JobDiaryDao.java
+++ b/skyeye-jobdiary/src/main/java/com/skyeye/eve/dao/JobDiaryDao.java
--- a/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/JobDiaryService.java
+++ b/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/JobDiaryService.java
--- a/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java
+++ b/skyeye-jobdiary/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java
--- a/skyeye-jobdiary/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml
+++ b/skyeye-jobdiary/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml
--- a/skyeye-jobdiary/src/main/resources/reqmapping/mapping/jobdiary.xml
+++ b/skyeye-jobdiary/src/main/resources/reqmapping/mapping/jobdiary.xml
--- a/skyeye-knowlg/.gitignore
+++ b/skyeye-knowlg/.gitignore
--- a/skyeye-knowlg/.project
+++ b/skyeye-knowlg/.project
--- a/skyeye-knowlg/pom.xml
+++ b/skyeye-knowlg/pom.xml
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/controller/KnowledgeContentController.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/controller/KnowledgeContentController.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/controller/KnowledgeTypeController.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/controller/KnowledgeTypeController.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/dao/KnowledgeContentDao.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/dao/KnowledgeContentDao.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/dao/KnowledgeTypeDao.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/dao/KnowledgeTypeDao.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/service/KnowledgeContentService.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/service/KnowledgeContentService.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/service/KnowledgeTypeService.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/service/KnowledgeTypeService.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/service/impl/KnowledgeContentServiceImpl.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/service/impl/KnowledgeContentServiceImpl.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/eve/service/impl/KnowledgeTypeServiceImpl.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/eve/service/impl/KnowledgeTypeServiceImpl.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/knowlg/util/Html2Text.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/knowlg/util/Html2Text.java
--- a/skyeye-knowlg/src/main/java/com/skyeye/knowlg/util/Word2Html.java
+++ b/skyeye-knowlg/src/main/java/com/skyeye/knowlg/util/Word2Html.java
--- a/skyeye-knowlg/src/main/resources/mapper/knowledge/KnowledgeContentMapper.xml
+++ b/skyeye-knowlg/src/main/resources/mapper/knowledge/KnowledgeContentMapper.xml
--- a/skyeye-knowlg/src/main/resources/mapper/knowledge/KnowledgeTypeMapper.xml
+++ b/skyeye-knowlg/src/main/resources/mapper/knowledge/KnowledgeTypeMapper.xml
--- a/skyeye-knowlg/src/main/resources/reqmapping/mapping/knowledge.xml
+++ b/skyeye-knowlg/src/main/resources/reqmapping/mapping/knowledge.xml
--- a/skyeye-light-app/.gitignore
+++ b/skyeye-light-app/.gitignore
--- a/skyeye-light-app/.project
+++ b/skyeye-light-app/.project
--- a/skyeye-light-app/pom.xml
+++ b/skyeye-light-app/pom.xml
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/controller/LightAppController.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/controller/LightAppController.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/controller/LightAppTypeController.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/controller/LightAppTypeController.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/dao/LightAppDao.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/dao/LightAppDao.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/dao/LightAppTypeDao.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/dao/LightAppTypeDao.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/service/LightAppService.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/service/LightAppService.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/service/LightAppTypeService.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/service/LightAppTypeService.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/service/impl/LightAppServiceImpl.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/service/impl/LightAppServiceImpl.java
--- a/skyeye-light-app/src/main/java/com/skyeye/eve/service/impl/LightAppTypeServiceImpl.java
+++ b/skyeye-light-app/src/main/java/com/skyeye/eve/service/impl/LightAppTypeServiceImpl.java
--- a/skyeye-light-app/src/main/resources/mapper/lightapp/LightAppMapper.xml
+++ b/skyeye-light-app/src/main/resources/mapper/lightapp/LightAppMapper.xml
--- a/skyeye-light-app/src/main/resources/mapper/lightapp/LightAppTypeMapper.xml
+++ b/skyeye-light-app/src/main/resources/mapper/lightapp/LightAppTypeMapper.xml
--- a/skyeye-light-app/src/main/resources/reqmapping/mapping/lightapp.xml
+++ b/skyeye-light-app/src/main/resources/reqmapping/mapping/lightapp.xml
--- a/skyeye-mail/.gitignore
+++ b/skyeye-mail/.gitignore
--- a/skyeye-mail/.project
+++ b/skyeye-mail/.project
--- a/skyeye-mail/pom.xml
+++ b/skyeye-mail/pom.xml
--- a/skyeye-mail/src/main/java/com/skyeye/eve/controller/MailListController.java
+++ b/skyeye-mail/src/main/java/com/skyeye/eve/controller/MailListController.java
--- a/skyeye-mail/src/main/java/com/skyeye/eve/dao/MailListDao.java
+++ b/skyeye-mail/src/main/java/com/skyeye/eve/dao/MailListDao.java
--- a/skyeye-mail/src/main/java/com/skyeye/eve/service/MailListService.java
+++ b/skyeye-mail/src/main/java/com/skyeye/eve/service/MailListService.java
--- a/skyeye-mail/src/main/java/com/skyeye/eve/service/impl/MailListServiceImpl.java
+++ b/skyeye-mail/src/main/java/com/skyeye/eve/service/impl/MailListServiceImpl.java
--- a/skyeye-mail/src/main/resources/mapper/mail/MailListMapper.xml
+++ b/skyeye-mail/src/main/resources/mapper/mail/MailListMapper.xml
--- a/skyeye-mail/src/main/resources/reqmapping/mapping/mail.xml
+++ b/skyeye-mail/src/main/resources/reqmapping/mapping/mail.xml
--- a/skyeye-md2file/.gitignore
+++ b/skyeye-md2file/.gitignore
--- a/skyeye-md2file/.project
+++ b/skyeye-md2file/.project
--- a/skyeye-md2file/pom.xml
+++ b/skyeye-md2file/pom.xml
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/BuilderFactory.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/BuilderFactory.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/Decorator.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/Decorator.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/DocDecorator.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/DocDecorator.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/DocxDecorator.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/DocxDecorator.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/FileFactory.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/FileFactory.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/HTMLDecorator.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/HTMLDecorator.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/PDFDecorator5x.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/PDFDecorator5x.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/PDFDecorator5xHelper.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/PDFDecorator5xHelper.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/DecoratorBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/DecoratorBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/DocDecoratorBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/DocDecoratorBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/DocxDecoratorBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/DocxDecoratorBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/HTMLDecoratorBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/HTMLDecoratorBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/PDFDecoratorBuilder5x.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/export/builder/PDFDecoratorBuilder5x.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/Block.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/Block.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/BlockType.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/BlockType.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/LinkOrImageBeanTmp.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/LinkOrImageBeanTmp.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/ListBuilderCon.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/ListBuilderCon.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/MDAnalyzer.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/MDAnalyzer.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/MDToken.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/MDToken.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/TextOrTable.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/TextOrTable.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/ValuePart.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/ValuePart.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/BlockBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/BlockBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/CodeBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/CodeBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/CommonTextBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/CommonTextBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/HeaderBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/HeaderBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/ListBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/ListBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/OrderedListBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/OrderedListBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/QuoteBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/QuoteBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/UnorderedListBuilder.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/markdown/builder/UnorderedListBuilder.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/util/ImgHelper.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/util/ImgHelper.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/util/MD2FileUtil.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/util/MD2FileUtil.java
--- a/skyeye-md2file/src/main/java/com/youbenzi/md2/util/MDUtil.java
+++ b/skyeye-md2file/src/main/java/com/youbenzi/md2/util/MDUtil.java
--- a/skyeye-md2file/src/main/resources/MSYH.TTF
+++ b/skyeye-md2file/src/main/resources/MSYH.TTF
--- a/skyeye-md2file/src/main/resources/quote_char.jpg
+++ b/skyeye-md2file/src/main/resources/quote_char.jpg
--- a/skyeye-message/.gitignore
+++ b/skyeye-message/.gitignore
--- a/skyeye-message/.project
+++ b/skyeye-message/.project
--- a/skyeye-message/pom.xml
+++ b/skyeye-message/pom.xml
--- a/skyeye-message/src/main/java/com/skyeye/eve/controller/SysEveUserNoticeController.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/controller/SysEveUserNoticeController.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/controller/SysNoticeController.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/controller/SysNoticeController.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/controller/SysNoticeTypeController.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/controller/SysNoticeTypeController.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/dao/SysEveUserNoticeDao.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/dao/SysEveUserNoticeDao.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/dao/SysNoticeDao.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/dao/SysNoticeDao.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/dao/SysNoticeTypeDao.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/dao/SysNoticeTypeDao.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/service/SysEveUserNoticeService.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/service/SysEveUserNoticeService.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/service/SysNoticeService.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/service/SysNoticeService.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/service/SysNoticeTypeService.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/service/SysNoticeTypeService.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysEveUserNoticeServiceImpl.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysEveUserNoticeServiceImpl.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysNoticeServiceImpl.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysNoticeServiceImpl.java
--- a/skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysNoticeTypeServiceImpl.java
+++ b/skyeye-message/src/main/java/com/skyeye/eve/service/impl/SysNoticeTypeServiceImpl.java
--- a/skyeye-message/src/main/resources/mapper/message/SysEveUserNoticeMapper.xml
+++ b/skyeye-message/src/main/resources/mapper/message/SysEveUserNoticeMapper.xml
--- a/skyeye-message/src/main/resources/mapper/message/SysNoticeMapper.xml
+++ b/skyeye-message/src/main/resources/mapper/message/SysNoticeMapper.xml