Merge branch 'master' of http://47.92.161.104:10080/fulonglong/chargeing-parking

pom.xml

@@ -215,11 +215,11 @@
             <version>3.13.2</version>
         </dependency>
         <!-- aliyun oss end -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>5.2.0.Final</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.hibernate</groupId>-->
+<!--            <artifactId>hibernate-validator</artifactId>-->
+<!--            <version>5.2.0.Final</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.taobao</groupId>
             <artifactId>taobao-sdk-java</artifactId>

src/main/java/com/charging/chargingparking/sys/entity/User.java

@@ -18,6 +18,7 @@ public class User {
 	private String userName;
 	private String password;
 	private String realName;
+	private String phoneNum;
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	private Date createTime;

src/main/resources/mapper/sys/User.xml

@@ -16,6 +16,7 @@
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="openId" column="open_id"/>
+        <result property="phoneNum" column="phone_num"/>
     </resultMap>
     <insert id="insert" parameterType="com.charging.chargingparking.sys.entity.User">
         <!--
@@ -26,7 +27,7 @@
         <![CDATA[
 		insert into sys_user
 	    (id_,company_id,user_name,password_,real_name,create_time,update_time,
-	    del_flag,create_by,update_by,open_id)
+	    del_flag,create_by,update_by,open_id,phone_num)
 		values
 		(
             #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
             ,#{createBy,jdbcType=VARCHAR}
             ,#{updateBy,jdbcType=VARCHAR}
             ,#{openId,jdbcType=VARCHAR}
+            ,#{phoneNum,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -79,6 +81,9 @@
             <if test="openId!=null">
                 open_id=#{openId,jdbcType=VARCHAR},
             </if>
+            <if test="phoneNum!=null">
+                phone_num=#{phoneNum,jdbcType=VARCHAR},
+            </if>
         </set>
         where id_=#{id}
     </update>
@@ -94,7 +99,6 @@
     <select id="findByCompanyId" parameterType="string" resultMap="UserMap">
         select * from sys_user where company_id = #{0} and  del_flag = 0
     </select>
-
     <select id="findByCompanyList" resultMap="UserMap">
         select * from sys_user
         <where>