merge dev

lego/utils/codec/factory/factory_struct.go

@@ -114,13 +114,9 @@ func describeStruct(ctx *codecore.Ctx, typ reflect2.Type) *StructDescriptor {
 	bindings := []*Binding{}
 	for i := 0; i < structType.NumField(); i++ {
 		field := structType.Field(i)
-<<<<<<< HEAD
 		if !utils.IsExported(field.Name()) { //内部字段不处理
 			continue
 		}
-=======
-		log.Debugf("field:%v", field)
->>>>>>> 830997df434fe5d5d1769768c53efaa0caff2969
 		tag, hastag := field.Tag().Lookup(ctx.Config.TagKey)
 		if ctx.Config.OnlyTaggedField && !hastag && !field.Anonymous() {
 			continue