Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/IndustryCaseQO.java

@@ -54,6 +54,10 @@ public class IndustryCaseQO implements Serializable {
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;
 
+
+    @ApiModelProperty(value = "是否是热点新闻")
+    private Integer isHot;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/qo/IndustryNewsQO.java

@@ -40,6 +40,9 @@ public class IndustryNewsQO implements Serializable {
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;
 
+    @ApiModelProperty(value = "是否是热点新闻")
+    private Integer isHot;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: d716ba06478c08d9f6c49cbc563152e57391fec3
+  newTag: c477a655cee6ec3c581eaa564c18d04dc486f9d6

release-service/src/main/resources/mapper/news/IndustryNewsDao.xml

@@ -31,7 +31,8 @@
         news_contents,
         origin,
         create_time,
-        update_time
+        update_time,
+        is_hot
         from industry_news
         where is_deleted = 0
         <if test=" userIds != null ">
@@ -43,6 +44,9 @@
         <if test="date != null ">
             and Date(create_time) = #{date}
         </if>
+        <if test="isHot != null">
+            and is_hot = #{isHot}
+        </if>
         <if test="keyword != null ">
             and news_title like CONCAT("%",#{keyword},"%")
         </if>
@@ -170,6 +174,9 @@
             <if test="endTime != null">
                 and create_time &lt;= #{endTime}
             </if>
+        <if test="isHot != null">
+            and is_hot = #{isHot}
+        </if>
         </where>
         order by is_hot desc,create_time desc
         limit #{pageNo}, #{pageSize}