Commits · cf40a06d988d2b8983d51c82a7371a1c6c104c2a · Administrator / jfV5portal

17 Sep, 2018 1 commit
- 主题查询bug修复 · cf40a06d
  罗绍泽 authored Sep 17, 2018
  
  cf40a06d Browse Files
07 Sep, 2018 2 commits
- 论坛功能添加 · 07d9f753
  罗绍泽 authored Sep 07, 2018
  
  07d9f753 Browse Files
- 删除测试用的json数据文件 · f12b65a4
  罗绍泽 authored Sep 07, 2018
  
  f12b65a4 Browse Files
06 Sep, 2018 16 commits
- Merge remote-tracking branch 'origin/develop' into develop · 1f21017e
  罗绍泽 authored Sep 06, 2018
  
  1f21017e Browse Files
- 日志bug修复 · edb25497
  罗绍泽 authored Sep 06, 2018
  
  edb25497 Browse Files
- 修改样式 · d0280e4a
  周添尉 authored Sep 06, 2018
  
  d0280e4a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 538a8438
  周添尉 authored Sep 06, 2018
  
  538a8438 Browse Files
- ueditor功能修复 · 32495378
  罗绍泽 authored Sep 06, 2018
  
  32495378 Browse Files
- Merge remote-tracking branch 'origin/zhutc' into develop · f3dd8b8d
  罗绍泽 authored Sep 06, 2018
  
  f3dd8b8d Browse Files
- 日志 · 39e76091
  朱天成 authored Sep 06, 2018
  
  39e76091 Browse Files
- 修复 · 05faac16
  罗绍泽 authored Sep 06, 2018
  
  05faac16 Browse Files
- Merge remote-tracking branch 'origin/zhouwq' into develop · 40406738
  罗绍泽 authored Sep 06, 2018
  
  40406738 Browse Files
- 报工修改 · 122cca26
  周王清 authored Sep 06, 2018
  
  122cca26 Browse Files
- Merge remote-tracking branch 'origin/zhouwq' into develop · 0c1dd58d
  罗绍泽 authored Sep 06, 2018
  
  0c1dd58d Browse Files
- 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
- 报工模块的修改 · ea11fd40
```
修复了user_id，dept_id不能存入；
删除了bgmkDAO，多余的3个抽象方法；
user_id，正确修复了读取的值
dao.xml 优化了where
```
  周王清 authored Sep 06, 2018
  ea11fd40 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