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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/ArticleOfficialServiceImpl.java

@@ -185,8 +185,7 @@
      } else {

         state = 0;

      }

      resultObj.setState(state);

      articleOfficialDao.save(resultObj);

      articleOfficialDao.updateSatate(id, state);

   }

   

   @Override