Merge remote-tracking branch 'origin/mark' into yonghui

controllers/cms_store.go

@@ -553,6 +553,7 @@ func (c *StoreController) GetStoreListByLocation() {
 // @Title 老格恢复拓店进度
 // @Description 老格恢复拓店进度
 // @Param	token			header		string	true	"认证token"
+// @Param	vendorOrgCode	formData	string	false	"厂商内组织代码"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /JdStoreInfoCoordinateRecover [post]
@@ -560,7 +561,7 @@ func (c *StoreController) JdStoreInfoCoordinateRecover() {
 	c.callJdStoreInfoCoordinateRecover(func(params *tStoreJdStoreInfoCoordinateRecoverParams) (retVal interface{}, errCode string, err error) {
 		r := c.Ctx.Request
 		files := r.MultipartForm.File["userfiles"]
-		err = cms.JdStoreInfoCoordinateRecover(params.Ctx, files)
+		err = cms.JdStoreInfoCoordinateRecover(params.Ctx, params.VendorOrgCode, files)
 		return retVal, "", err
 	})
 }