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

admin

2019-10-25 14f8255006245ab8473d3b0c755e76f9e9b8148f

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

@@ -1107,10 +1107,10 @@
                  continue;

               }



               Integer state = oldExtra.getState();

               if (state != null && state == 1) {

                  continue;

               }

               /*

                * Integer state = oldExtra.getState(); if (state != null && state == 1) {

                * continue; }

                */



               TaoBaoGoodsBrief goodsBrief = null;

               try {