Merge branch 'test' of http://gitlab.fjmaimaimai.com/mmm-go/oppmg into test

@@ -137,6 +137,10 @@ func (this *TemplateController) TemplateUpdate() {
 		msg = m
 		msg = m
 		return
 		return
 	}
 	}
+	if len([]rune(request.Template.Name)) > 10 {
+		msg = protocol.BadRequestParam("10070")
+		return
+	}
 	if len([]rune(request.Template.Doc)) > 30 {
 	if len([]rune(request.Template.Doc)) > 30 {
 		msg = protocol.BadRequestParam("10272")
 		msg = protocol.BadRequestParam("10272")
 		return
 		return

@@ -451,9 +451,10 @@ func TemplateGet(uid, companyId int64, request *protocol.TemplateGetRequest) (rs
 			rsp.Template.InputList = append(rsp.Template.InputList, &protocol.InputElement{
 			rsp.Template.InputList = append(rsp.Template.InputList, &protocol.InputElement{
 				Id:          input.Id,
 				Id:          input.Id,
 				Sort:        input.SortNum,
 				Sort:        input.SortNum,
-				Label:       input.InputType,
+				Label:       input.Label,
 				Required:    int(input.Required),
 				Required:    int(input.Required),
 				SectionType: input.Section,
 				SectionType: input.Section,
+				InputType:   input.InputType,
 			})
 			})
 		}
 		}
 		if configs, err = models.GetAuditFlowConfig(template.Id); err != nil {
 		if configs, err = models.GetAuditFlowConfig(template.Id); err != nil {