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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java

@@ -35,7 +35,7 @@
   @Resource

   private SystemZnxService systemZnxService;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addUserSystemMsg(Long uid, UserSystemMsgTypeEnum type, String title, String content, int timeTag,

         SystemZnx sz) throws UserSystemMsgException {