Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java

@@ -120,7 +120,7 @@
   }



   @Override

   public Organization getOrganizationsById(int id) {

   public Organization getOrganizationById(int id) {

       Example example = new Example(ENTITY_CLASS);

       example.or().andEqualTo("id",id);

       List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);