Merge remote-tracking branch 'origin/div' into div

admin

2019-11-25 e65037e672ecab852e2a6c5b242cdadfd1a58b33

 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java

@@ -40,4 +40,9 @@
         elmeOrderMapper.updateByPrimaryKeySelective(update);

      }

   }



   @Override

   public ElmeOrder selectByPrimaryKey(Long id) {

      return elmeOrderMapper.selectByPrimaryKey(id);

   }

}