冲突文件提交本地

2018-07-10 16:49:28 +08:00
parent 2203786946
commit 83fb581fb5
3 changed files with 25 additions and 22 deletions
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -363,8 +363,8 @@ arbitrary=\u4EFB\u610F
 basic_config=\u57FA\u672C\u914D\u7F6E
 block_config=\u914D\u7F6E\u4FE1\u606F
 expression_type=\u8868\u8FBE\u5F0F\u7C7B\u578B
-null=\u65E0\u8868\u8FBE\u5F0F
-and=\u4E0E\u8868\u8FBE\u5F0F
+null_expression=\u65E0\u8868\u8FBE\u5F0F
+and_expression=\u4E0E\u8868\u8FBE\u5F0F
 match_method=\u5339\u914D\u65B9\u5F0F
 substring_match=\u5B50\u4E32\u5339\u914D
 right_match=\u53F3\u5339\u914D