Commits · f54acf5f9a8379ac03dd27812ea602030242f86a · wangweidong / patzn-cloud-service-hmhj

17 Jun, 2021 4 commits
- Merge remote-tracking branch 'origin/master' · f54acf5f
  lijingjing authored Jun 17, 2021
  
  f54acf5f Browse Files
- 添加电解槽基础数据管理 · ad22e0ae
  lijingjing authored Jun 17, 2021
  
  ad22e0ae Browse Files
- Merge remote-tracking branch 'origin/master' · 5cef27b8
```
# Conflicts:
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
#	src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml
```
  wangweidong authored Jun 17, 2021
  5cef27b8 Browse Files
- HMHJ报告生成优化 · 7d251600
  wangweidong authored Jun 17, 2021
  
  7d251600 Browse Files
16 Jun, 2021 2 commits

修改报告问题； · 81165497
lijingjing authored Jun 16, 2021

81165497 Browse Files

Merge remote-tracking branch 'origin/master' · 63785439

# Conflicts:
#	src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalTemplateController.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/IOriginalTemplateService.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
#	src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java
#	src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

authored Jun 16, 2021

63785439 Browse Files

15 Jun, 2021 3 commits
- hmhj修改部分优化 · 808f4142
  wangweidong authored Jun 15, 2021
  
  808f4142 Browse Files
- 霍煤鸿骏原始记录 · 4000d190
  wangweidong authored Jun 15, 2021
  
  4000d190 Browse Files
- 用户组判断修改； · a9fa1531
  lijingjing authored Jun 15, 2021
  
  a9fa1531 Browse Files
14 Jun, 2021 1 commit

添加样品管理接口； · 3c908735

添加样品备样字段：区分是备样还是样品；
添加报告批准和发放接口；

authored Jun 14, 2021

3c908735 Browse Files

13 Jun, 2021 2 commits
- 修改配置文件为本地开发环境； · 52031b3f
  lijingjing authored Jun 13, 2021
  
  52031b3f Browse Files
- 修改测试问题； · f366a5f7
  lijingjing authored Jun 13, 2021
  
  f366a5f7 Browse Files
12 Jun, 2021 2 commits
- local 配置文件； · 9ec03519
  lijingjing authored Jun 12, 2021
  
  9ec03519 Browse Files
- 修改生成报告错误问题； · 5b317fb6
  lijingjing authored Jun 12, 2021
  
  5b317fb6 Browse Files
11 Jun, 2021 2 commits
- Merge remote-tracking branch 'origin/master' · 276f197b
  wangweidong authored Jun 11, 2021
  
  276f197b Browse Files
- 霍煤鸿骏系统 · f98d2cc9
  wangweidong authored Jun 11, 2021
  
  f98d2cc9 Browse Files
10 Jun, 2021 3 commits
- 增加演示环境配置文件 · 64dc09b6
  yangmengmeng authored Jun 10, 2021
  
  64dc09b6 Browse Files
- hmhj · f8866f2e
  wangweidong authored Jun 10, 2021
  
  f8866f2e Browse Files
- 霍煤鸿骏优化 · f34e1195
  wangweidong authored Jun 10, 2021
  
  f34e1195 Browse Files
05 Jun, 2021 3 commits
- 霍煤宏骏优化 · b2d4cd79
  wangweidong authored Jun 05, 2021
  
  b2d4cd79 Browse Files
- Merge remote-tracking branch 'origin/master' · 56ee1842
  wangweidong authored Jun 05, 2021
  
  56ee1842 Browse Files
- 霍煤宏骏优化 · 5db1af11
  wangweidong authored Jun 05, 2021
  
  5db1af11 Browse Files
04 Jun, 2021 1 commit
- 增加k8s配置文件 · b4b35b18
  yangmengmeng authored Jun 04, 2021
  
  b4b35b18 Browse Files
01 Jun, 2021 1 commit
- 霍煤宏骏 · ca4f3d9b
  wangweidong authored Jun 01, 2021
  
  ca4f3d9b Browse Files
28 May, 2021 1 commit
- 霍煤鸿骏 · d68bffe6
  wangweidong authored May 28, 2021
  
  d68bffe6 Browse Files
26 May, 2021 4 commits
- 霍煤宏骏添加环境配置文件 · a95d8cff
  wangweidong authored May 26, 2021
  
  a95d8cff Browse Files
- 霍煤宏骏 · 4e619a63
  wangweidong authored May 26, 2021
  
  4e619a63 Browse Files
- Merge remote-tracking branch 'origin/master' · 4efcf96b
  wangweidong authored May 26, 2021
  
  4efcf96b Browse Files
- 霍煤鸿骏 · 933bf87c
  wangweidong authored May 26, 2021
  
  933bf87c Browse Files
25 May, 2021 1 commit
- 添加hmhj配置文件 · a1a61219
  zhangmengqi authored May 25, 2021
  
  a1a61219 Browse Files
18 May, 2021 1 commit
- 霍煤鸿骏 · c20366d6
  wangweidong authored May 18, 2021
  
  c20366d6 Browse Files
06 May, 2021 1 commit
- meter计量修改部分优化 · 787e59e7
  wangweidong authored May 06, 2021
  
  787e59e7 Browse Files
28 Apr, 2021 7 commits
- Merge remote-tracking branch 'origin/master' · 92b0684a
  wangweidong authored Apr 28, 2021
  
  92b0684a Browse Files
- 霍煤鸿骏 · 2418e6e2
  wangweidong authored Apr 28, 2021
  
  2418e6e2 Browse Files
- 增加报错消息发送 · 4c062ae5
  yangmengmeng authored Apr 28, 2021
  
  4c062ae5 Browse Files
- 增加报错消息发送 · f010ff40
  yangmengmeng authored Apr 28, 2021
  
  f010ff40 Browse Files
- 增加报错消息发送 · d33c7828
  yangmengmeng authored Apr 28, 2021
  
  d33c7828 Browse Files
- 增加报错消息发送 · 211acc29
  yangmengmeng authored Apr 28, 2021
  
  211acc29 Browse Files
- 增加报错消息发送 · e5e117dc
  yangmengmeng authored Apr 28, 2021
  
  e5e117dc Browse Files
26 Apr, 2021 1 commit
- me霍煤鸿骏 · 6ebe7617
  wangweidong authored Apr 26, 2021
  
  6ebe7617 Browse Files