Merge branch 'sxy' into dev

pkg/common/msg.go

@@ -91,6 +91,8 @@ var EnMessages = map[string]string{
 	"更新成功":             "Update successful",
 	"保存成功":             "Save successful",
 	"优惠单价转换失败":         "Discount unit price conversion failed",
+	"符号错误":             "Symbol error",
+	"条件冲突":             "Condition conflict",
 }
 
 var DeDEMessages = map[string]string{
@@ -176,6 +178,8 @@ var DeDEMessages = map[string]string{
 	"更新成功":             "Aktualisierung erfolgreich",
 	"保存成功":             "Speichern erfolgreich",
 	"优惠单价转换失败":         "Rabatt-Einzelpreisumrechnung fehlgeschlagen",
+	"符号错误":             "Symbolfehler",
+	"条件冲突":             "Bedingungskonflikt",
 }
 
 var JaJPMessages = map[string]string{
@@ -261,6 +265,8 @@ var JaJPMessages = map[string]string{
 	"更新成功":             "更新が成功しました",
 	"保存成功":             "保存が成功しました",
 	"优惠单价转换失败":         "割引単価変換に失敗しました",
+	"符号错误":             "記号エラー",
+	"条件冲突":             "条件競合",
 }
 
 var ZhTWMessages = map[string]string{
@@ -350,4 +356,6 @@ var ZhTWMessages = map[string]string{
 	"更新成功":             "更新成功",
 	"保存成功":             "儲存成功",
 	"优惠单价转换失败":         "優惠單價轉換失敗",
+	"符号错误":             "符號錯誤",
+	"条件冲突":             "條件衝突",
 }