Commits · 789d8ac86a12561077cc1d4060bc5dd8dff64dba · Administrator / jfV5portal · GitLab

06 Sep, 2018 4 commits
- Merge remote-tracking branch 'origin/develop' into develop · 789d8ac8
  罗绍泽 authored Sep 06, 2018
  
  789d8ac8 Browse Files
- Merge remote-tracking branch 'origin/zhutc' into develop · 13b78f06
```
# Conflicts:
#	WebContent/WEB-INF/conf/gaowj/bl/business-apps.xml
#	src/struts-ext.xml
```
  罗绍泽 authored Sep 06, 2018
  13b78f06 Browse Files
- 代办事项提交 · 5b9f42ac
  罗绍泽 authored Sep 06, 2018
  
  5b9f42ac Browse Files
- 日志 · c32feafd
  朱天成 authored Sep 06, 2018
  
  c32feafd Browse Files
05 Sep, 2018 1 commit
- 添加待办事项 · 379db9a6
  罗绍泽 authored Sep 05, 2018
  
  379db9a6 Browse Files
04 Sep, 2018 1 commit
- 日志管理 · 5a8be4b2
  朱天成 authored Sep 04, 2018
  
  5a8be4b2 Browse Files
03 Sep, 2018 2 commits
- 网盘修改了选择人员的模块 · 9d267701
  周添尉 authored Sep 03, 2018
  
  9d267701 Browse Files
- 修改imp 一个bug，表名修改 · 69d0fe7e
  周王清 authored Sep 03, 2018
  
  69d0fe7e Browse Files
31 Aug, 2018 4 commits
- 修改冲突 · feb9ba12
  周添尉 authored Aug 31, 2018
  
  feb9ba12 Browse Files
- 单点地址 · 0cc41607
  周添尉 authored Aug 31, 2018
  
  0cc41607 Browse Files
- 网盘 · 2c22f158
  周添尉 authored Aug 31, 2018
  
  2c22f158 Browse Files
- Merge remote-tracking branch 'origin/zhouwq' into develop · e4a89b10
```
# Conflicts:
#	WebContent/WEB-INF/conf/gaowj/bl/business-apps.xml
#	src/struts-ext.xml
```
  罗绍泽 authored Aug 31, 2018
  e4a89b10 Browse Files
30 Aug, 2018 3 commits
- Merge remote-tracking branch 'origin/develop' into develop · 30477210
  罗绍泽 authored Aug 30, 2018
  
  30477210 Browse Files
- 办事大厅修改 · 87f43308
  罗绍泽 authored Aug 30, 2018
  
  87f43308 Browse Files
- 通知公告 · e981d246
  周王清 authored Aug 30, 2018
  
  e981d246 Browse Files
29 Aug, 2018 2 commits
- 快速链接_第二版 · 41a3f10a
  周王清 authored Aug 29, 2018
  
  41a3f10a Browse Files
- 会议管理 · 7ca3676e
  朱天成 authored Aug 29, 2018
  
  7ca3676e Browse Files
28 Aug, 2018 1 commit
- 快速链接模块 · e56cf9a3
  周王清 authored Aug 28, 2018
  
  e56cf9a3 Browse Files
27 Aug, 2018 6 commits
- 报工管理 · e6a09a06
  周王清 authored Aug 27, 2018
  
  e6a09a06 Browse Files
- 修改了数据库 · f3dab0be
  郎靓静 authored Aug 27, 2018
  
  f3dab0be Browse Files
- 合并考勤模块 · f1c3eea2
  罗绍泽 authored Aug 27, 2018
  
  f1c3eea2 Browse Files
- Merge remote-tracking branch 'origin/zhutc' into develop · 38a5e626
```
# Conflicts:
#	WebContent/gaowj/ria/jquery/jquery-easyui-1.4.1/themes/icon.css
```
  罗绍泽 authored Aug 27, 2018
  38a5e626 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 3d191322
  罗绍泽 authored Aug 27, 2018
  
  3d191322 Browse Files
- 办事大厅集成 · 9d8a08a6
  罗绍泽 authored Aug 27, 2018
  
  9d8a08a6 Browse Files
24 Aug, 2018 1 commit
- 投票2.0 · 1042d8f0
  朱天成 authored Aug 24, 2018
  
  1042d8f0 Browse Files
22 Aug, 2018 1 commit
- 考勤模块 · 8006d117
  周王清 authored Aug 22, 2018
  
  8006d117 Browse Files
21 Aug, 2018 2 commits
- 初步完成了网盘的所有功能 · 2df712a3
  周添尉 authored Aug 21, 2018
  
  2df712a3 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 7127a9bd
  周添尉 authored Aug 21, 2018
  
  7127a9bd Browse Files
14 Aug, 2018 2 commits
- Merge remote-tracking branch 'origin/develop' into develop · e58a9dda
```
# Conflicts:
#	WebContent/WEB-INF/conf/gaowj/bl/business-apps.xml
```
  罗绍泽 authored Aug 14, 2018
  e58a9dda Browse Files
- 添加应用角色功能，添加模拟登陆配置 · f45e4933
  罗绍泽 authored Aug 14, 2018
  
  f45e4933 Browse Files
13 Aug, 2018 1 commit
- 添加了办事大厅模块 · 1742061b
  周添尉 authored Aug 13, 2018
  
  1742061b Browse Files
09 Aug, 2018 4 commits
- 修改登出日志 · 5d3b4a3c
  周添尉 authored Aug 09, 2018
  
  5d3b4a3c Browse Files
- Merge branch 'develop' of http://git.jfbrother.com/root/jfV5portal into develop · 9464e257
  周添尉 authored Aug 09, 2018
  
  9464e257 Browse Files
- Merge remote-tracking branch 'origin/zhutc' into develop · 3d024588
  周添尉 authored Aug 09, 2018
  
  3d024588 Browse Files
- 修改下载 · c23a5070
  周添尉 authored Aug 09, 2018
  
  c23a5070 Browse Files
08 Aug, 2018 5 commits
- Revert "Revert "投票功能初版"" · 473407a6
```
This reverts commit e66a3949.
```
  朱天成 authored Aug 08, 2018
  473407a6 Browse Files
- Revert "投票功能初版" · e66a3949
```
This reverts commit f5f3c82a.
```
  朱天成 authored Aug 08, 2018
  e66a3949 Browse Files
- $WQ-20160408XBSX\Administrator's avatar$
  
  投票功能初版 · f5f3c82a
  WQ-20160408XBSX\Administrator authored Aug 08, 2018
  
  f5f3c82a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 6be3d484
  罗绍泽 authored Aug 08, 2018
  
  6be3d484 Browse Files
- 乱码 · 5fd9581a
  罗绍泽 authored Aug 08, 2018
  
  5fd9581a Browse Files