Merge branches 'dev' and 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml

@@ -37,7 +37,7 @@
             grid_id,
             message_content
         FROM
-            epmet_message.user_message
+            user_message
         WHERE
             del_flag = '0'
           AND (

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -33,8 +33,8 @@
         SELECT
             pi.*
         FROM
-            epmet_resi_partymember.partymember_info pi
+            partymember_info pi
-                LEFT JOIN epmet_resi_partymember.partymember_confirm_manual pcm ON pi.ID = pcm.PARTYMEMBER_INFO_ID
+                LEFT JOIN partymember_confirm_manual pcm ON pi.ID = pcm.PARTYMEMBER_INFO_ID
                 AND pcm.DEL_FLAG = 0
         WHERE
             pi.CUSTOMER_ID = #{customerId}
@@ -50,7 +50,7 @@
         SELECT
             *
         FROM
-            epmet_resi_partymember.partymember_info
+            partymember_info
         WHERE
             CUSTOMER_ID = #{customerId}
           AND MOBILE = #{mobile}

epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml

@@ -22,7 +22,7 @@
                APP,
                ROLE_NAME,
                ROLE_KEY
-        from epmet_user.epmet_role
+        from epmet_role
         where APP = #{app}
             and ROLE_KEY = #{roleKey}
             and DEL_FLAG = 0