Merge branch 'div1'

yujian

2019-01-05 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java

@@ -1430,8 +1430,7 @@
         if (commision == null) {

             commision = 0;

         }

         map.put("commision", commision + "年");

			
         map.put("commision", commision);

         

         listObject.add(map);

      }