Merge remote-tracking branch 'origin/master'

renren-admin/src/main/java/io/renren/modules/qyh/entity/NewsEntity.java

@@ -56,6 +56,15 @@ public class NewsEntity implements Serializable {
 	 */
 	private Integer status;
 
+	/**
+	 * 浏览量
+	 */
+	private Integer hits;
+	/**
+	 * 排序号
+	 */
+	private Integer sortNo;
+
 	/**
 	 * 创建人
 	 */

renren-admin/src/main/java/io/renren/modules/qyh/model/dto/NewsDTO.java

@@ -56,6 +56,15 @@ public class NewsDTO implements Serializable {
 	@ApiModelProperty(value = "状态 1启用 0禁用")
 	private Integer status;
 
+	/**
+	 * 浏览量
+	 */
+	private Integer hits;
+	/**
+	 * 排序号
+	 */
+	private Integer sortNo;
+
 	/**
 	 * 创建人
 	 */

renren-admin/src/main/resources/mapper/qyh/NewsDao.xml

@@ -10,6 +10,8 @@
         <result property="publishTime" column="publish_time"/>
         <result property="content" column="content"/>
         <result property="status" column="status"/>
+        <result property="hits" column="hits"/>
+        <result property="sortNo" column="sort_no"/>
         <result property="createId" column="create_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateId" column="update_id"/>