Merge branch 'bzq1/excel_rule_decimal_master' of eta_server/eta_api into master

controllers/data_manage/excel/excel_info.go

@@ -3152,12 +3152,8 @@ func (c *ExcelInfoController) AddExcelRule() {
 		br.Msg = "应用选区不能为空"
 		return
 	}
-	if req.FontColor == "" {
-		br.Msg = "字体颜色不能为空"
-		return
-	}
-	if req.BackgroundColor == "" {
-		br.Msg = "背景颜色不能为空"
+	if req.FontColor == "" && req.BackgroundColor == "" {
+		br.Msg = "字体颜色和背景颜色不能同时为空"
 		return
 	}
 	if req.RuleType == 3 && req.RightValue == "" {