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

yujian

2020-04-16 c57f9a24c525aa557225b663fa55120a36f99735

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

@@ -24,7 +24,7 @@
   @Resource

   private ElmeHongBaoOrderMapMapper elmeHongBaoOrderMapMapper;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addHongBaoOrderMap(ElmeHongBaoOrderMap map) throws ElmeHongBaoOrderMapException {

      if (map.getElmeOrder() == null || map.getElmeOrder().getId() == null || map.getHongBao() == null