Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

 fanli/src/main/java/com/yeshi/fanli/dto/common/CommonContentResult.java

@@ -1,10 +1,12 @@
package com.yeshi.fanli.dto.common;



import java.io.Serializable;

import java.util.List;



import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;



public class CommonContentResult {

public class CommonContentResult implements Serializable {

   private static final long serialVersionUID = 1L;

   private List<TaoBaoGoodsBrief> goodsList;

   private long count;