Merge branch 'develop' into payment

pkg/utils/status.go

@@ -37,8 +37,6 @@ const (
 	MinSort uint8  = 1   //全局基础最小排序
 	SIZE           = 20  //全局基础每页数
 
-	ProjectSaleId  = 8
-	ProjectPrintId = 9
 
 	DecollatorComma       = "," //逗号分割符
 	DecollatorColon       = ":"

pkg/validate/defValidator.go

@@ -1,14 +1,16 @@
 package validate
 
 const (
-	FieldId          = "Id.required"
-	FieldIdValue     = "ID不能为空"
-	FieldStatus      = "Status.required"
-	FieldStatusValue = "状态不能为空"
-	FieldTypeIn      = "Type.oneof"
-	FieldTypeInValue = "类型传值不对"
-	FieldType        = "Type.required"
-	FieldTypeValue   = "类型不能为空"
+	FieldId            = "Id.required"
+	FieldIdValue       = "ID不能为空"
+	FieldStatus        = "Status.required"
+	FieldStatusValue   = "状态不能为空"
+	FieldStatusIn      = "Status.oneof"
+	FieldStatusInValue = "状态不能不对"
+	FieldTypeIn        = "Type.oneof"
+	FieldTypeInValue   = "类型传值不对"
+	FieldType          = "Type.required"
+	FieldTypeValue     = "类型不能为空"
 )
 
 type StatusValidator struct {