Commits · e91e20fff62e4029c2c0ffff9d1d0c2303fc883d · zry / performance · GitLab

24 Feb, 2022 3 commits
- Merge tag '提取出现空行' into develop · e91e20ff
```
# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.Api.xml
```
  lcx committed Feb 24, 2022
  e91e20ff Browse Files
- Merge branch 'hotfix/提取出现空行' · 3b76ba1f
  lcx committed Feb 24, 2022
  
  3b76ba1f Browse Files
- 科室名称重复导致行增多 · c2bcf13d
  lcx committed Feb 24, 2022
  
  c2bcf13d Browse Files
23 Feb, 2022 1 commit
- 别名 · d0766222
  ruyun.zhang@suvalue.com committed Feb 23, 2022
  
  d0766222 Browse Files
22 Feb, 2022 4 commits
- Merge branch 'feature/二次分配列头别名' into develop · e24a0b7a
  ruyun.zhang@suvalue.com committed Feb 22, 2022
  
  e24a0b7a Browse Files
- 二次分配列头别名 · e8e35e91
  ruyun.zhang@suvalue.com committed Feb 22, 2022
  
  e8e35e91 Browse Files
- Merge branch 'feature/自定义菜单' into develop · e36b32f4
  ruyun.zhang@suvalue.com committed Feb 22, 2022
  
  e36b32f4 Browse Files
- 自定义列头显示 · ed1ddcbb
  ruyun.zhang@suvalue.com committed Feb 22, 2022
  
  ed1ddcbb Browse Files
21 Feb, 2022 2 commits
- Merge branch 'feature/医院其他绩效备注' into develop · 43b2f77e
  ruyun.zhang@suvalue.com committed Feb 21, 2022
  
  43b2f77e Browse Files
- 医院其他绩效备注 · 95ae2e44
  ruyun.zhang@suvalue.com committed Feb 21, 2022
  
  95ae2e44 Browse Files
17 Feb, 2022 4 commits
- Merge branch 'release/v22.1.7-Stable' · a1f2863b
  ruyun.zhang@suvalue.com committed Feb 17, 2022
  
  a1f2863b Browse Files
- 补漏 · 93f2a53c
  纪旭韦 committed Feb 17, 2022
  
  93f2a53c Browse Files
- 返回消息修改 · 34ffa4da
  lcx committed Feb 17, 2022
  
  34ffa4da Browse Files
- 修复汇总表没有默认分组 · 3f4af873
  纪旭韦 committed Feb 17, 2022
  
  3f4af873 Browse Files
16 Feb, 2022 2 commits
- 修复汇总表少一个月数据 · dc75f953
  纪旭韦 committed Feb 16, 2022
  
  dc75f953 Browse Files
- Merge branch 'feature/抽取配置优化' into develop · 0de87fec
```
# Conflicts:
#	performance/Performance.Api/Controllers/ModExtractController.cs
```
  lcx committed Feb 16, 2022
  0de87fec Browse Files
15 Feb, 2022 9 commits
- 精简代码 · f78291b1
  ruyun.zhang@suvalue.com committed Feb 15, 2022
  
  f78291b1 Browse Files
- 固定列/行优化 · 402df3e5
  ruyun.zhang@suvalue.com committed Feb 15, 2022
  
  402df3e5 Browse Files
- Merge branch 'hotfix/二次分配保存前重新计算' into develop · 6071efe6
  ruyun.zhang@suvalue.com committed Feb 15, 2022
  
  6071efe6 Browse Files
- Merge branch 'feature/在线浏览编辑Excel' into develop · 659f7573
  ruyun.zhang@suvalue.com committed Feb 15, 2022
  
  659f7573 Browse Files
- 再次调整 · 4d573014
  ruyun.zhang@suvalue.com committed Feb 15, 2022
  
  4d573014 Browse Files
- Merge tag '列保留原始顺序' into develop · 4467e5d3
  lcx committed Feb 15, 2022
  
  4467e5d3 Browse Files
- Merge branch 'hotfix/列保留原始顺序' · fc3a95ba
  lcx committed Feb 15, 2022
  
  fc3a95ba Browse Files
- 保留顺序 · 5b42c000
  lcx committed Feb 15, 2022
  
  5b42c000 Browse Files
- 优化 · 13d40beb
  ruyun.zhang@suvalue.com committed Feb 15, 2022
  
  13d40beb Browse Files
14 Feb, 2022 9 commits
- Merge tag '提取SQL优先于公式' into develop · 129fb7bd
  lcx committed Feb 14, 2022
  
  129fb7bd Browse Files
- Merge branch 'hotfix/提取SQL优先于公式' · 754f20d3
  lcx committed Feb 14, 2022
  
  754f20d3 Browse Files
- 提取数据优先公式 · dc211ac8
  lcx committed Feb 14, 2022
  
  dc211ac8 Browse Files
- Merge branch 'feature/后台任务' into develop · bf9ab1bf
  ruyun.zhang@suvalue.com committed Feb 14, 2022
  
  bf9ab1bf Browse Files
- 2099-01-01 · 5745c293
  ruyun.zhang@suvalue.com committed Feb 14, 2022
  
  5745c293 Browse Files
- Merge branch 'release/V20220107绩效v22.1.7' · 527ea30b
  ruyun.zhang@suvalue.com committed Feb 14, 2022
  
  527ea30b Browse Files
- Merge branch 'release/V20220107绩效v22.1.7' into develop · cebfe753
  ruyun.zhang@suvalue.com committed Feb 14, 2022
  
  cebfe753 Browse Files
- BUG修复 · 573f6615
  ruyun.zhang@suvalue.com committed Feb 14, 2022
  
  573f6615 Browse Files
- 修改提取信息配置接口内容 · 74668ca7
  lcx committed Feb 14, 2022
  
  74668ca7 Browse Files
11 Feb, 2022 6 commits
- 输出日志调整 · 545574cd
  ruyun.zhang@suvalue.com committed Feb 11, 2022
  
  545574cd Browse Files
- 优化调整 · 8696386c
  ruyun.zhang@suvalue.com committed Feb 11, 2022
  
  8696386c Browse Files
- Merge branch 'feature/二次分配提交撤回' into develop · 36cc5a31
  ruyun.zhang@suvalue.com committed Feb 11, 2022
  
  36cc5a31 Browse Files
- 撤回提交 · df395b3d
  ruyun.zhang@suvalue.com committed Feb 11, 2022
  
  df395b3d Browse Files
- Merge branch 'feature/版本提醒' into develop · a97c9350
  ruyun.zhang@suvalue.com committed Feb 11, 2022
  
  a97c9350 Browse Files
- 新增版本号查询接口 · 5e832b48
  ruyun.zhang@suvalue.com committed Feb 11, 2022
  
  5e832b48 Browse Files