Merge branch 'master_develop' into master_local_test

JieLing 2020-07-27 18:23:41 +08:00
commit 27437ad948
4 changed files with 2 additions and 2 deletions

View File

@ -3273,8 +3273,8 @@ RANKINFO_PARAM1_FIELD.index = 1
RANKINFO_PARAM1_FIELD.label = 1
RANKINFO_PARAM1_FIELD.has_default_value = false
RANKINFO_PARAM1_FIELD.default_value = 0
RANKINFO_PARAM1_FIELD.type = 5
RANKINFO_PARAM1_FIELD.cpp_type = 1
RANKINFO_PARAM1_FIELD.type = 3
RANKINFO_PARAM1_FIELD.cpp_type = 2
RANKINFO_PARAM2_FIELD.name = "param2"
RANKINFO_PARAM2_FIELD.full_name = ".com.ljsd.jieling.protocols.RankInfo.param2"

Binary file not shown.