Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -59,12 +59,7 @@
     <!--  根据app、openId查询用户是否存在  -->
     <select id="selectUserDTOByOpenId" parameterType="com.epmet.dto.form.WxLoginUserInfoFormDTO" resultType="com.epmet.dto.UserDTO">
         SELECT
-            u.ID,
+            u.*
-            u.CUSTOMER_ID,
-            u.FROM_APP,
-            u.FROM_CLIENT,
-            u.CREATED_TIME,
-            u.CREATED_BY
         FROM
             USER u
             LEFT JOIN user_wechat uw ON (