Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/XxpClassifyDetail.java

@@ -57,6 +57,10 @@ public class XxpClassifyDetail extends  BaseEntity
     private Integer sort;
 
 
+    /** 是否共有 1非公共 2公共   */
+    @Excel(name = "是否共有")
+    @ApiModelProperty(value = "是否共有")
+    private Integer isCollective;
 
     /** 用户id */
     @Excel(name = "用户id")

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpClassifyDetailMapper.xml

@@ -11,6 +11,7 @@
         <result property="infoType" column="info_type"/>
         <result property="infoContent" column="info_content"/>
         <result property="sort" column="sort"/>
+        <result property="isCollective" column="is_collective"/>
         <result property="userId" column="user_id"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -25,6 +26,7 @@
                info_type,
                info_content,
                sort,
+               is_collective,
                user_id,
                create_by,
                create_time,
@@ -42,6 +44,7 @@
             <if test="infoType != null ">and t.info_type = #{infoType}</if>
             <if test="infoContent != null ">and t.info_content = #{infoContent}</if>
             <if test="sort != null ">and t.sort = #{sort}</if>
+            <if test="isCollective != null ">and t.is_collective = #{isCollective}</if>
             <if test="userId != null ">and t.user_id = #{userId}</if>
             <if test="createBy != null ">and t.create_by = #{createBy}</if>
             <if test="searchValue != null and searchValue != ''">
@@ -76,6 +79,8 @@
 
             <if test="sort != null">sort,</if>
 
+            <if test="isCollective != null">is_collective,</if>
+
             <if test="userId != null">user_id,</if>
 
             <if test="createBy != null">create_by,</if>
@@ -92,6 +97,7 @@
             <if test="infoType != null">#{infoType},</if>
             <if test="infoContent != null">#{infoContent},</if>
             <if test="sort != null">#{sort},</if>
+            <if test="isCollective != null">#{isCollective},</if>
             <if test="userId != null">#{userId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -108,6 +114,7 @@
             <if test="infoType != null">info_type = #{infoType},</if>
             <if test="infoContent != null">info_content = #{infoContent},</if>
             <if test="sort != null">sort = #{sort},</if>
+            <if test="isCollective != null">is_collective = #{isCollective},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>