 sige
|
7357a8c9f0
|
1
|
1 year ago |
|
sige
|
b3020c2a06
|
1
|
1 year ago |
|
sige
|
07d92a4ed1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/a8k/appbean/HardwareException.java
# src/main/java/a8k/base_hardware/A8kCanBusService.java
# src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java
|
1 year ago |
|
sige
|
1d275eb39f
|
1
|
1 year ago |
 zhaohe
|
e3eca3714f
|
update
|
1 year ago |
|
zhaohe
|
5fd251b18f
|
update
|
1 year ago |
|
zhaohe
|
4cd1ca3013
|
update
|
1 year ago |
|
sige
|
16724b8a18
|
Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
sige
|
009e00df83
|
1
|
1 year ago |
|
zhaohe
|
0a57e15d9d
|
Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
zhaohe
|
17a51f365c
|
update
|
1 year ago |
|
sige
|
1294fcdd76
|
1
|
1 year ago |
|
sige
|
92f94e792c
|
Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
sige
|
17c617ddb6
|
1
|
1 year ago |
|
zhaohe
|
abed2c8aba
|
update
|
1 year ago |
|
sige
|
c4c673315c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
sige
|
b6cbb8591b
|
1
|
1 year ago |
|
zhaohe
|
2b91b55606
|
update
|
1 year ago |
|
zhaohe
|
f1a8c31197
|
update
|
1 year ago |
|
zhaohe
|
e48949fada
|
update
|
1 year ago |
|
zhaohe
|
2a4a2c2631
|
Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
zhaohe
|
c928e03e8e
|
update
|
1 year ago |
|
sige
|
8e23dbab90
|
1
|
1 year ago |
|
sige
|
afe52fc8cf
|
1
|
1 year ago |
|
zhaohe
|
8eaa445c07
|
update
|
1 year ago |
|
zhaohe
|
5db38bf5f2
|
update
|
1 year ago |
|
zhaohe
|
d3f733507c
|
add ModuleRegConfigIterm
|
1 year ago |
|
zhaohe
|
a58ab81189
|
update
|
1 year ago |
|
zhaohe
|
29f94e4103
|
Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
zhaohe
|
6db7743dfc
|
update
|
1 year ago |
|
zhaohe
|
24aa8d3202
|
update
|
1 year ago |
|
sige
|
16ca214a6b
|
1
|
1 year ago |
|
sige
|
25149f15c1
|
Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
zhaohe
|
447aa2cd90
|
update
|
1 year ago |
|
zhaohe
|
3cfb15be71
|
add tubeSpacing to MotorTubeRackMoveCtrlServiceParameter
|
1 year ago |
|
zhaohe
|
67076690f4
|
remove takeTubeCapPos sampleBeginPos sampleEndPos from sampleEndPos
|
1 year ago |
|
zhaohe
|
8cd4f139ac
|
update
|
1 year ago |
|
sige
|
96392c00ce
|
Merge branch 'master' of http://192.168.1.3:3000/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
sige
|
5774929bc5
|
1
|
1 year ago |
|
zhaohe
|
57f99fec8c
|
add A8kDebugTaskExecutorService
|
1 year ago |
|
zhaohe
|
184f06ae89
|
,update
|
1 year ago |
|
zhaohe
|
7c66377ec1
|
update
|
1 year ago |
|
zhaohe
|
df49477cb6
|
添加 scanClampModuleCompress 和 scanClampModuleReset 两个方法
|
1 year ago |
|
sige
|
91bdf4409b
|
1
|
1 year ago |
|
sige
|
9031fef9f2
|
1
|
1 year ago |
|
sige
|
591f8eeb87
|
Merge branch 'master' of http://192.168.1.3:3000/project_boditech_vidas_a8000_v3/a8k_app
|
1 year ago |
|
sige
|
345c617c33
|
1
|
1 year ago |
|
zhaohe
|
95c3f2126c
|
添加 scanClampModuleCompress 和 scanClampModuleReset 两个方法
|
1 year ago |
|
sige
|
9d38cde185
|
x
|
1 year ago |
|
zhaohe
|
00d5cd69d4
|
添加 scanClampModuleCompress 和 scanClampModuleReset 两个方法
|
1 year ago |
