Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeMediaMapper.xml

@@ -27,7 +27,7 @@
                create_time,
                update_time,
                delete_flag
-        from haoban3.tab_haoban_welcome_media
+        from tab_haoban_welcome_media
         where welcome_media_id = #{welcomeMediaId}
     </select>
 
@@ -58,7 +58,7 @@
 
     <!--通过主键修改数据-->
     <update id="update">
-        update haoban3.tab_haoban_welcome_media
+        update tab_haoban_welcome_media
         <set>
             <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
                 wx_enterprise_id = #{wxEnterpriseId},

haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeSuitRangMapper.xml

@@ -35,7 +35,7 @@
                create_time,
                update_time,
                delete_flag
-        from haoban3.tab_haoban_welcome_suit_rang
+        from tab_haoban_welcome_suit_rang
         where welcome_suit_rang_id = #{welcomeSuitRangId}
     </select>
 
@@ -55,7 +55,7 @@
                create_time,
                update_time,
                delete_flag
-        from haoban3.tab_haoban_welcome_suit_rang limit #{offset}, #{limit}
+        from tab_haoban_welcome_suit_rang limit #{offset}, #{limit}
     </select>
 
     <!--通过实体作为筛选条件查询-->
@@ -65,7 +65,7 @@
         suit_staff_id, suit_staff_name, staff_belong_department_id, staff_belong_department_name, select_type,
         create_time,
         update_time, delete_flag
-        from haoban3.tab_haoban_welcome_suit_rang
+        from tab_haoban_welcome_suit_rang
         <where>
             <if test="welcomeSuitRangId != null">
                 and welcome_suit_rang_id = #{welcomeSuitRangId}
@@ -114,7 +114,7 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="welcomeSuitRangId" useGeneratedKeys="false">
-        insert into haoban3.tab_haoban_welcome_suit_rang(welcome_suit_rang_id, wx_enterprise_id, welcome_id, suit_type, suit_department_id,
+        insert into tab_haoban_welcome_suit_rang(welcome_suit_rang_id, wx_enterprise_id, welcome_id, suit_type, suit_department_id,
                                                          suit_department_name, suit_staff_id, suit_staff_name,
                                                          staff_belong_department_id, staff_belong_department_name,
                                                          select_type,
@@ -126,7 +126,7 @@
 
     <!--通过主键修改数据-->
     <update id="update">
-        update haoban3.tab_haoban_welcome_suit_rang
+        update tab_haoban_welcome_suit_rang
         <set>
             <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
                 wx_enterprise_id = #{wxEnterpriseId},
@@ -174,7 +174,7 @@
     <!--通过主键删除-->
     <delete id="deleteById">
         delete
-        from haoban3.tab_haoban_welcome_suit_rang
+        from tab_haoban_welcome_suit_rang
         where welcome_suit_rang_id = #{welcomeSuitRangId}
     </delete>