Merge branch 'dev' into local-tangxvhui

@@ -22,7 +22,7 @@ type UpdateCompanyCommand struct {
 }
 }
 
 
 func (updateCompanyCommand *UpdateCompanyCommand) Valid(validation *validation.Validation) {
 func (updateCompanyCommand *UpdateCompanyCommand) Valid(validation *validation.Validation) {
-	validation.SetError("CustomValid", "未实现的自定义认证")
+	//validation.SetError("CustomValid", "未实现的自定义认证")
 }
 }
 
 
 func (updateCompanyCommand *UpdateCompanyCommand) ValidateCommand() error {
 func (updateCompanyCommand *UpdateCompanyCommand) ValidateCommand() error {

@@ -68,6 +68,7 @@ func (repository *CompanyRepository) Save(company *domain.Company) (*domain.Comp
 	} else {
 	} else {
 		if _, err := tx.QueryOne(
 		if _, err := tx.QueryOne(
 			pg.Scan(
 			pg.Scan(
+				&company.CompanyId,
 				&company.CompanyConfig,
 				&company.CompanyConfig,
 				&company.CompanyInfo,
 				&company.CompanyInfo,
 				&company.Status,
 				&company.Status,