Commits · e137df4580ce37d95ac6d88f46e1cf5189e10616 · 周磊 / GC_Branch

27 Aug, 2018 4 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · e137df45
  wangwanxh@sina.com authored Aug 27, 2018
  
  e137df45
- 8-27 R · a31487e0
  wangwanxh@sina.com authored Aug 27, 2018
  
  a31487e0
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 634de4fb
  wangjunqiang authored Aug 27, 2018
  
  634de4fb
- 修复部分小bug · 1181eac7
  wangjunqiang authored Aug 27, 2018
  
  1181eac7
22 Aug, 2018 1 commit
- 8-22 · f548e085
  wangwanxh@sina.com authored Aug 22, 2018
  
  f548e085
16 Aug, 2018 3 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 537fb05f
  wangwanxh@sina.com authored Aug 16, 2018
  
  537fb05f
- 5 · e60a026a
  wangwanxh@sina.com authored Aug 16, 2018
  
  e60a026a
- div 0 bug · 745fbdc6
  wangjunqiang authored Aug 16, 2018
  
  745fbdc6
15 Aug, 2018 6 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 60af091a
  wangjunqiang authored Aug 15, 2018
  
  60af091a
- 修复柱箱默认保护温度 · 83a094cb
  wangjunqiang authored Aug 15, 2018
  
  83a094cb
- 报警值 · 6f873fa3
  wangwanxh@sina.com authored Aug 15, 2018
  
  6f873fa3
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · c4156cc6
  wangjunqiang authored Aug 15, 2018
  
  c4156cc6
- 测试修复0 salve bug · 403a62e9
  wangjunqiang authored Aug 15, 2018
  
  403a62e9
- 15/8 · e9f78a53
  wangwanxh@sina.com authored Aug 15, 2018
  
  e9f78a53
14 Aug, 2018 5 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 8508b00e
  wangjunqiang authored Aug 14, 2018
  
  8508b00e
- 修正计数器位置 · 2544a6c0
  wangjunqiang authored Aug 14, 2018
  
  2544a6c0
- 7 · 9015a986
  wangwanxh@sina.com authored Aug 14, 2018
  
  9015a986
- 添加自动校准进度反馈地址 · 4fa9a9cb
  wangjunqiang authored Aug 14, 2018
  
  4fa9a9cb
- 14 · 9de2ecab
  wangwanxh@sina.com authored Aug 14, 2018
  
  9de2ecab
10 Aug, 2018 7 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 017b67c6
  wangjunqiang authored Aug 10, 2018
  
  017b67c6
- 切换为新地址版本 · a83f5998
  wangjunqiang authored Aug 10, 2018
  
  a83f5998
- 6 · 9d8b5f0a
  wangwanxh@sina.com authored Aug 10, 2018
  
  9d8b5f0a
- 添加moudbus控制自动校准 · 6b7f5145
  wangjunqiang authored Aug 10, 2018
  
  6b7f5145
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 6635628f
  wangjunqiang authored Aug 10, 2018
  
  6635628f
- 同步 · e74df40c
  wangjunqiang authored Aug 10, 2018
  
  e74df40c
- 定时 · 4f2f7910
  wangwanxh@sina.com authored Aug 10, 2018
  
  4f2f7910
09 Aug, 2018 8 commits
- 修复方法窗口问题 · f4b5b84e
  wangjunqiang authored Aug 09, 2018
  
  f4b5b84e
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · b12f3fbe
  wangjunqiang authored Aug 09, 2018
  
  b12f3fbe
- 修改温度显示为一个小数点 · 4e2bed0e
  wangjunqiang authored Aug 09, 2018
  
  4e2bed0e
- 5 · 17dd8a1a
  wangwanxh@sina.com authored Aug 09, 2018
  
  17dd8a1a
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · d39c641c
  wangwanxh@sina.com authored Aug 09, 2018
  
  d39c641c
- 4 · b0c66c26
  wangwanxh@sina.com authored Aug 09, 2018
  
  b0c66c26
- 修复自启动创建批处理文件问题 · b6ab6dae
  wangjunqiang authored Aug 09, 2018
  
  b6ab6dae
- 修复小bug · c5961b04
  wangjunqiang authored Aug 09, 2018
  
  c5961b04
08 Aug, 2018 3 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · edda63be
  wangwanxh@sina.com authored Aug 08, 2018
  
  edda63be
- 2 · cefe2d79
  wangwanxh@sina.com authored Aug 08, 2018
  
  cefe2d79
- fix fid show data · 9beb7646
  wangjunqiang authored Aug 08, 2018
  
  9beb7646
02 Aug, 2018 1 commit
- 更新为了兼容老模块 · 4cbd05b6
  wangjunqiang authored Aug 02, 2018
  
  4cbd05b6
27 Jul, 2018 2 commits
- Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master · 881b020e
  wangwanxh@sina.com authored Jul 27, 2018
  
  881b020e
- 7-27 · 6d8fe00a
  wangwanxh@sina.com authored Jul 27, 2018
  
  6d8fe00a