Merge "增加常量设置"