Merge branch 'master_chujiang' into mater_procurement

@@ -677,6 +677,16 @@ public class CustomerCreditController extends DefaultBaseController {
                 credit.setCompanyName(customer.getName());
                 credit.setCompanyName(customer.getName());
             }
             }
         }
         }
+        //办事处
+        if (StringUtils.isNotEmpty(credit.getDeptId())) {
+            SysDept sysDept = sysDeptService.findById(credit.getDeptId());
+            credit.setDeptName(sysDept.getName());
+        }
+        //区域
+        if (StringUtils.isNotEmpty(credit.getRegion())) {
+            SysDept sysDept = sysDeptService.findById(credit.getRegion());
+            credit.setRegionName(sysDept.getName());
+        }
         return credit;
         return credit;
     }
     }