Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java

@@ -42,6 +42,11 @@ public class SyScene implements Serializable {
      */
     private String interfaceAddress;
 
+    /**
+     * 描述
+     */
+    private String description;
+
     /**
      * 数据是否有效，用来标识逻辑删除，1：可用，0：已被逻辑删除
      */

shuili-system/src/main/resources/mapper/yg/znjg/SySceneMapper.xml

@@ -10,12 +10,13 @@
         <result property="pubDate" column="pub_date" jdbcType="TIMESTAMP"/>
         <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
         <result property="interfaceAddress" column="interface_address" jdbcType="VARCHAR"/>
+        <result property="description" column="description" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         y.id
         ,y.name,y.pub_date,
-        y.create_user,y.interface_address
+        y.create_user,y.interface_address,description
     </sql>
     <select id="findSceneList" resultType="com.kms.yg.znjg.vo.SySceneVo">
         SELECT
@@ -28,6 +29,9 @@
         <if test="syScene.name != null">
             AND name LIKE CONCAT(CONCAT('%', TRIM(#{syScene.name,jdbcType=VARCHAR})), '%')
         </if>
+        <if test="syScene.description != null">
+            AND description LIKE CONCAT(CONCAT('%', TRIM(#{syScene.description,jdbcType=VARCHAR})), '%')
+        </if>
         <if test="syScene.interfaceAddress != null">
             AND interface_address LIKE CONCAT(CONCAT('%', TRIM(#{syScene.interfaceAddress,jdbcType=VARCHAR})), '%')
         </if>