冲突解决

yujian

2019-01-09 075f6eceec6908178ba53b40b7794e2f90f74c92

 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -38,6 +38,7 @@
      // 保留字段

      cg.setVideoCover(null);

      cg.setVideoUrl(null);

      cg.setState(goods.getState());

      return cg;

   }