合并分支 'dev' 到 'test'

Dev



查看合并请求 !33

@@ -23,7 +23,7 @@ func (controller *ColumnSettingController) Prepare() {
 	if ok := controller.ValidJWTToken(); !ok {
 	if ok := controller.ValidJWTToken(); !ok {
 		return
 		return
 	}
 	}
-	if ok := controller.ValidAdminPermission(domain.PERMINSSION_PARTNER); !ok {
+	if ok := controller.ValidAdminPermission(domain.PERMISSION_ORDER); !ok {
 		return
 		return
 	}
 	}
 }
 }

@@ -1152,6 +1152,7 @@ func (c *OrderInfoController) ImportOrderFromExcel() {
 					tmpRow = append(tmpRow, s)      // 行号
 					tmpRow = append(tmpRow, s)      // 行号
 					tmpRow = append(tmpRow, row...) // 错误行数据
 					tmpRow = append(tmpRow, row...) // 错误行数据
 					partnerDataList = append(partnerDataList, tmpRow)
 					partnerDataList = append(partnerDataList, tmpRow)
+					break
 				}
 				}
 
 
 				saleDateWithTz := time.Date(timeValue.Year(), timeValue.Month(), timeValue.Day(), time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
 				saleDateWithTz := time.Date(timeValue.Year(), timeValue.Month(), timeValue.Day(), time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)