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

admin

2019-10-30 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54

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

@@ -4,6 +4,13 @@
   private String cid;

   private String name;

   private String picture;

	
   public CommonContentNav() {

   }

   public CommonContentNav(String cid, String name) {

      this.cid = cid;

      this.name = name;

   }



   public String getCid() {

      return cid;