Commits · b0823f199c9f01e2707e2efc0a36340e71d12166 · zry / performance

05 Aug, 2019 2 commits
- no message · b0823f19
  799284587@qq.com committed Aug 05, 2019
  
  b0823f19 Browse Files
- Merge branch 'develop' into feature/0724 · fb866850
```
# Conflicts:
#	performance/Performance.Api/Controllers/TemplateController.cs
#	performance/Performance.Api/Template/医院绩效模板.xlsx
```
  799284587@qq.com committed Aug 05, 2019
  fb866850 Browse Files
02 Aug, 2019 9 commits
- no message · 960c5538
  799284587@qq.com committed Aug 02, 2019
  
  960c5538 Browse Files
- 参数调整 · 6ab669ac
  李承祥 committed Aug 02, 2019
  
  6ab669ac Browse Files
- 特殊科室人均 · f0937a80
  李承祥 committed Aug 02, 2019
  
  f0937a80 Browse Files
- no message · 9d36c3ff
  799284587@qq.com committed Aug 02, 2019
  
  9d36c3ff Browse Files
- Merge branch 'feature/jwt' into develop · fb1d4b62
```
# Conflicts:
#	performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
#	performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
#	performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs
#	performance/Performance.EntityModels/Entity/mod_module.cs
#	performance/Performance.EntityModels/Entity/res_account.cs
#	performance/Performance.Extract.Api/Controllers/ModExtractController.cs
#	performance/Performance.Services/AllotCompute/ProcessComputService.cs
#	performance/Performance.Services/ComputeService.cs
#	performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadDeptAccountingt.cs
```
  799284587@qq.com committed Aug 02, 2019
  fb1d4b62 Browse Files
- 返回新增保底绩效 · 123b65a9
  799284587@qq.com committed Aug 02, 2019
  
  123b65a9 Browse Files
- 模板调整 · e8cdadd7
  799284587@qq.com committed Aug 02, 2019
  
  e8cdadd7 Browse Files
- 保底绩效 · 5354f590
  799284587@qq.com committed Aug 02, 2019
  
  5354f590 Browse Files
- Merge branch 'feature/jwt' into local · 5acae741
  李承祥 committed Aug 02, 2019
  
  5acae741 Browse Files
01 Aug, 2019 5 commits
- 优化 · 519f3277
  799284587@qq.com committed Aug 01, 2019
  
  519f3277 Browse Files
- 人员缺失默认值 · 263c85cf
  799284587@qq.com committed Aug 01, 2019
  
  263c85cf Browse Files
- 模板修改 · 37766ab0
  799284587@qq.com committed Aug 01, 2019
  
  37766ab0 Browse Files
- 优化 · f8cac7ae
  799284587@qq.com committed Aug 01, 2019
  
  f8cac7ae Browse Files
- 优化 · 5bbc5a35
  799284587@qq.com committed Aug 01, 2019
  
  5bbc5a35 Browse Files
31 Jul, 2019 9 commits
- 警告修复 · d286df15
  799284587@qq.com committed Jul 31, 2019
  
  d286df15 Browse Files
- 本地swagger与测试swagger json地址配置 · c823d7a9
  799284587@qq.com committed Jul 31, 2019
  
  c823d7a9 Browse Files
- bug修复 · 6ee7c7a5
  799284587@qq.com committed Jul 31, 2019
  
  6ee7c7a5 Browse Files
- bug修复 · 6b83695c
  799284587@qq.com committed Jul 31, 2019
  
  6b83695c Browse Files
- bug修复 · f855202a
  799284587@qq.com committed Jul 31, 2019
  
  f855202a Browse Files
- 工作量合计 · 7edaa096
  799284587@qq.com committed Jul 31, 2019
  
  7edaa096 Browse Files
- 科室经济核算表展示调整 · 09049971
  799284587@qq.com committed Jul 31, 2019
  
  09049971 Browse Files
- 原始数据展示修改 · 317f4b39
  799284587@qq.com committed Jul 31, 2019
  
  317f4b39 Browse Files
- 抽取方案接口调整 · 366f0b36
  李承祥 committed Jul 31, 2019
  
  366f0b36 Browse Files
30 Jul, 2019 5 commits
- bug修复 · a18cb637
  799284587@qq.com committed Jul 30, 2019
  
  a18cb637 Browse Files
- 新增返回结果 · df0aea33
  799284587@qq.com committed Jul 30, 2019
  
  df0aea33 Browse Files
- 修复bug · 1821e17f
  799284587@qq.com committed Jul 30, 2019
  
  1821e17f Browse Files
- 绩效科室绩效大动版，修改了很多，需详细测试 · c96be038
  799284587@qq.com committed Jul 30, 2019
  
  c96be038 Browse Files
- 医技科初稿 · 2f1759de
  799284587@qq.com committed Jul 30, 2019
  
  2f1759de Browse Files
29 Jul, 2019 4 commits
- 暂存绩效医技 · 92b3321d
  799284587@qq.com committed Jul 29, 2019
  
  92b3321d Browse Files
- jwt&swagger · d273e001
  799284587@qq.com committed Jul 29, 2019
  
  d273e001 Browse Files
- 添加系数 · 52f75cb8
  李承祥 committed Jul 29, 2019
  
  52f75cb8 Browse Files
- 抽取初稿 · 042ce8fe
  799284587@qq.com committed Jul 29, 2019
  
  042ce8fe Browse Files
26 Jul, 2019 1 commit
- 绩效考核项费用来源 · f62988ae
  李承祥 committed Jul 26, 2019
  
  f62988ae Browse Files
25 Jul, 2019 1 commit
- 绩效抽取方案 · 58010638
  李承祥 committed Jul 25, 2019
  
  58010638 Browse Files
24 Jul, 2019 3 commits
- Merge branch 'develop' into feature/0724 · b30e08ee
  799284587@qq.com committed Jul 24, 2019
  
  b30e08ee Browse Files
- no message · 9d1fe79b
  李承祥 committed Jul 24, 2019
  
  9d1fe79b Browse Files
- 新增entity · 0c5cc3b8
  李承祥 committed Jul 24, 2019
  
  0c5cc3b8 Browse Files
19 Jul, 2019 1 commit
- 取消抽取数据上传下载TOKEN验证 · 873936cb
  799284587@qq.com committed Jul 19, 2019
  
  873936cb Browse Files