tengyan.huang pushed to dev at Ahrs/AHRS
7e01364e7d Merge remote-tracking branch 'origin/dev' into dev
- 010cc1f7b4 上传文件鼠标悬停事件，错误修复
- View comparison for these 2 commits »
2 years ago
tengyan.huang pushed to dev at Ahrs/AHRS
- ccaa3baa58 Merge remote-tracking branch 'origin/dev' into dev
- e1fda3752e 申报中岗位变动 在专技系统中未查询到职称 字体缩小
- 03f7f3c10e Merge branch 'dev' of http://115.238.142.158:20182/Ahrs/AHRS into dev
- 19f6c11e5b 职称为专技系统中未查询到职称则字体缩小
- aa98b0fd42 Merge branch 'dev' of http://115.238.142.158:20182/Ahrs/AHRS into viewOptimize
Conflicts:
ruoyi-system/src/main/resources/static/js/activiti.js
ruoyi-system/src/main/resources/templates/process/declaration/Approval.html
ruoyi-system/src/main/resources/templates/process/include.html
ruoyi-system/src/main/resources/templates/process/recruitresult/declare.html
ruoyi-system/src/main/resources/templates/process/recruitresult/edit.html
- View comparison for these 11 commits »
2 years ago
tengyan.huang pushed to viewOptimize at Ahrs/AHRS
- 19f6c11e5b 职称为专技系统中未查询到职称则字体缩小
- aa98b0fd42 Merge branch 'dev' of http://115.238.142.158:20182/Ahrs/AHRS into viewOptimize
Conflicts:
ruoyi-system/src/main/resources/static/js/activiti.js
ruoyi-system/src/main/resources/templates/process/declaration/Approval.html
ruoyi-system/src/main/resources/templates/process/include.html
ruoyi-system/src/main/resources/templates/process/recruitresult/declare.html
ruoyi-system/src/main/resources/templates/process/recruitresult/edit.html
- 29fc52004b 查询统计错误修改
- cc03d3d5aa 解决岗位管理一键打包下载只下载岗位实施情况认定表和聘用名单的问题
- 3483851b15 修改提示信息框显示时间
- View comparison for these 111 commits »
2 years ago
tengyan.huang pushed to viewOptimize at Ahrs/AHRS
- f58e496337 增加二级评审添加人员附件提示功能；我的申报中增员、减员、岗位附件提示功能
2 years ago
tengyan.huang pushed to viewOptimize at Ahrs/AHRS
- fe7a3fe02b Merge remote-tracking branch 'origin/viewOptimize' into viewOptimize
- 5b1987e07c 以办任务添加函号和审批时间排序的图标更换
- View comparison for these 2 commits »
2 years ago
tengyan.huang pushed to viewOptimize at Ahrs/AHRS
- 5497870075 我的申报附件显示错误修复；岗位管理中历史修改记录添加附件提示功能
2 years ago
tengyan.huang pushed to viewOptimize at Ahrs/AHRS
- e91f622e7c 人员管理中子集操作中奖励、处分、合同、申诉模块添加附件提示功能；申报时间管理添加附件提示功能
2 years ago
tengyan.huang pushed to viewOptimize at Ahrs/AHRS
- f3f18a8f47 Merge remote-tracking branch 'origin/viewOptimize' into viewOptimize
- e3904b216c 以办任务添加函号和审批时间排序
- eda9d4ee19 Merge remote-tracking branch 'origin/viewOptimize' into viewOptimize
# Conflicts:
# ruoyi-admin/src/main/resources/templates/system/dept/dept.html
- e9d1ed3d73 增加附件提示功能
- View comparison for these 4 commits »
2 years ago
tengyan.huang pushed to master at DL-HNDJ/HNDJ
- b792ad5781 Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-hndj/src/main/java/com/ruoyi/base/staff/controller/StaffController.java
# ruoyi-hndj/src/main/java/com/ruoyi/party/partychangecheck/controller/PartyChangeCheckController.java
- 862e1e4f1c 知识库上级菜单选择优化 删除一些测试语句
- View comparison for these 2 commits »
2 years ago
tengyan.huang pushed to master at DL-HNDJ/HNDJ
- 5a220678e0 Merge remote-tracking branch 'origin/master'
- be617d813b 知识库 功能完善 bug修复
- c95e32122c 知识库 功能完善 bug修复
- View comparison for these 3 commits »
2 years ago