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

admin

2019-08-05 d0b7f936a3ae253efc67be35c349a647fec94594

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

@@ -978,9 +978,9 @@
    * 更新商品信息

    */

   public void updateGoodInfo(List<DynamicInfo> list) {

//      if (!Constant.IS_OUTNET) {

//         return; // 外网进行更新

//      }

      if (!Constant.IS_OUTNET) {

         return; // 外网进行更新

      }



      if (list == null || list.size() == 0) {

         return;