Authored by chaogeng

Merge branch 'master' into union_1101

... ... @@ -47,6 +47,36 @@ union_types:
- value: 20
name: ali_test10
- value: 21
name: ali_test11
- value: 22
name: ali_test12
- value: 23
name: ali_test13
- value: 24
name: ali_test14
- value: 25
name: ali_test15
- value: 26
name: ali_test16
- value: 27
name: ali_test17
- value: 28
name: ali_test18
- value: 29
name: ali_test19
- value: 30
name: ali_test20
- value: 100
name: ASZM-fensitong
... ...