Commits · 880e8d87a80c44015e639382985fd51a370e12a0 · 竹天卫 / tianjin-cement

29 Nov, 2020 2 commits
- 20201129 部署稳定版本 · 880e8d87
  竹天卫 authored Nov 29, 2020
  
  880e8d87
- application.yml 访问链接优化 · 7f5f784c
  竹天卫 authored Nov 29, 2020
  
  7f5f784c
26 Nov, 2020 2 commits
- 优化 · 8c941a2a
  竹天卫 authored Nov 26, 2020
  
  8c941a2a
- 校核计算优化 · c9c89d36
  竹天卫 authored Nov 26, 2020
  
  c9c89d36
25 Nov, 2020 3 commits
- 模板导出整理完成 · 477f2972
  竹天卫 authored Nov 25, 2020
  
  477f2972
- 采购维修计划模板 · 44414469
  qinhu authored Nov 25, 2020
  
  44414469
- 委托任务接收按钮去掉 · 9be2f801
  竹天卫 authored Nov 25, 2020
  
  9be2f801
23 Nov, 2020 3 commits
- 正式部署代码 · 290a3763
  竹天卫 authored Nov 23, 2020
  
  290a3763
- bug修改 · 87d5da31
  竹天卫 authored Nov 23, 2020
  
  87d5da31
- 祖军自测问题修改 · 7c406396
  竹天卫 authored Nov 23, 2020
  
  7c406396
21 Nov, 2020 10 commits
- 企業微信配置放在application.yml中 · 8e976220
  竹天卫 authored Nov 21, 2020
  
  8e976220
- 外部配置 · 19da2867
  shulidong authored Nov 21, 2020
  
  19da2867
- Merge remote-tracking branch 'origin/master' · 914542a3
  shulidong authored Nov 21, 2020
  
  914542a3
- 外部配置 · 68db5068
  shulidong authored Nov 21, 2020
  
  68db5068
- 导出列表修改 · 6c990697
  mengbali153 authored Nov 21, 2020
  
  6c990697
- 计划管理增加实施情况字段 · 90434e45
  竹天卫 authored Nov 21, 2020
  
  90434e45
- 计划加上实施情况 · befb6757
  竹天卫 authored Nov 21, 2020
  
  befb6757
- word补全页眉 · eb4420bc
  qinhu authored Nov 21, 2020
  
  eb4420bc
- Merge remote-tracking branch 'origin/master' · c8caf835
  qinhu authored Nov 21, 2020
  
  c8caf835
- 功能bug修改 · a28c9c41
  竹天卫 authored Nov 21, 2020
  
  a28c9c41
20 Nov, 2020 5 commits
- Merge remote-tracking branch 'origin/master' · 67610206
  qinhu authored Nov 20, 2020
```
# Conflicts:
#	cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java
#	cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java
```
  67610206
- word导出 · 9713c868
  qinhu authored Nov 20, 2020
  
  9713c868
- 非标产值：时间筛选 · 02b60fd2
  mengbali153 authored Nov 20, 2020
  
  02b60fd2
- 非标产值：时间筛选 · 49af994f
  mengbali153 authored Nov 20, 2020
  
  49af994f
- 非标产值：考核公值 · 671e0daa
  mengbali153 authored Nov 20, 2020
  
  671e0daa
19 Nov, 2020 1 commit
- 委托添加要求完成日期 · 1c6b308e
  竹天卫 authored Nov 19, 2020
  
  1c6b308e
18 Nov, 2020 8 commits
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 9e529091
  竹天卫 authored Nov 18, 2020
  
  9e529091
- 化学式下标优化 · f3030eff
  竹天卫 authored Nov 18, 2020
  
  f3030eff
- 1.样品处置列表 · 554c846d
  qinhu authored Nov 18, 2020
```
2.产值加急3倍
3.质量控制样品历史记录
```
  554c846d
- 上传pdf的cell包 · 5dc6af87
  qinhu authored Nov 18, 2020
  
  5dc6af87
- pdf · 000322ae
  qinhu authored Nov 18, 2020
  
  000322ae
- 1.报告导出新模板 · 8cb23f81
  qinhu authored Nov 18, 2020
```
2.excel转pdf
```
  8cb23f81
- Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement · 90a286f8
  竹天卫 authored Nov 18, 2020
  
  90a286f8
- 委托流程更改完成发送样品处理合并到评审按钮中 · 82d2d6f6
  竹天卫 authored Nov 18, 2020
  
  82d2d6f6
17 Nov, 2020 2 commits
- 培训计划修改 · 5c92030d
  mengbali153 authored Nov 17, 2020
  
  5c92030d
- 测试修改检测项管理处理项管理 · f2148030
  竹天卫 authored Nov 17, 2020
  
  f2148030
16 Nov, 2020 4 commits
- 样品增加产地字段 · 990c1955
  竹天卫 authored Nov 16, 2020
  
  990c1955
- 样品增加产地字段 · e327978d
  竹天卫 authored Nov 16, 2020
  
  e327978d
- 飞镖产值修改 · 953a2575
  mengbali153 authored Nov 16, 2020
  
  953a2575
- 标量添加产地信息 · dc6bb533
  qinhu authored Nov 16, 2020
  
  dc6bb533