Merge branch 'dev_pingyin_7_22' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pingyin_7_22

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java

@@ -138,4 +138,10 @@ public class CustomerStaffDTO implements Serializable {
 	 * 登录密码
 	 */
 	private String password;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java

@@ -101,4 +101,9 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
 	 * 登录密码
 	 */
 	private String password;
+
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
 }