diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java
index cf1a0224d05eb3292ee7b863d89533d75aca3153..dbf16334f2103848fc81d0fa1f724960866f9ca8 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java
@@ -1,6 +1,7 @@
 package com.mortals.xhx.common.pdu.dept;
 
 import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
 * @author zxfei
 * @date 2022-12-09
 */
+@Data
 public class DeptPdu extends BaseEntityLong {
     private static final long serialVersionUID = 1L;
 
@@ -82,2125 +84,7 @@ public class DeptPdu extends BaseEntityLong {
     */
     private Integer source;
 
-    /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
-    private Long idStart;
+    private List<Long> idList;
 
-    /** 缁撴潫 搴忓彿锛屼富閿紝鑷闀� */
-    private Long idEnd;
 
-    /** 澧炲姞 搴忓彿锛屼富閿紝鑷闀� */
-    private Long idIncrement;
-
-    /** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
-    private List <Long> idList;
-
-    /** 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d */
-    private List<String> tidList;
-
-    /** 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame */
-    private List<String> tnameList;
-
-    /** 閮ㄩ棬鍚嶇О */
-    private List<String> nameList;
-
-    /** 浠庢斂鍔$郴缁熸潵鐨勫埆鍚� */
-    private List<String> simpleNameList;
-
-    /** 寮€濮� 绔欑偣ID */
-    private Long siteIdStart;
-
-    /** 缁撴潫 绔欑偣ID */
-    private Long siteIdEnd;
-
-    /** 澧炲姞 绔欑偣ID */
-    private Long siteIdIncrement;
-
-    /** 绔欑偣ID鍒楄〃 */
-    private List <Long> siteIdList;
-
-    /** 閮ㄩ棬绠€绉� */
-    private List<String> deptAbbList;
-
-    /** 閮ㄩ棬鐢佃瘽 */
-    private List<String> deptTelphoneList;
-
-    /** 閮ㄩ棬缂栧彿 */
-    private List<String> deptNumberList;
-
-    /** 寮€濮� 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�)  */
-    private Integer isAutotableStart;
-
-    /** 缁撴潫 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�)  */
-    private Integer isAutotableEnd;
-
-    /** 澧炲姞 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�)  */
-    private Integer isAutotableIncrement;
-
-    /** 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> isAutotableList;
-
-    /** 寮€濮� 棰勭害灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isOrderStart;
-
-    /** 缁撴潫 棰勭害灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isOrderEnd;
-
-    /** 澧炲姞 棰勭害灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isOrderIncrement;
-
-    /** 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> isOrderList;
-
-    /** 寮€濮� 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�)  */
-    private Integer isBkbStart;
-
-    /** 缁撴潫 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�)  */
-    private Integer isBkbEnd;
-
-    /** 澧炲姞 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�)  */
-    private Integer isBkbIncrement;
-
-    /** 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> isBkbList;
-
-    /** 寮€濮� 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isWorkGuideStart;
-
-    /** 缁撴潫 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isWorkGuideEnd;
-
-    /** 澧炲姞 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isWorkGuideIncrement;
-
-    /** 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> isWorkGuideList;
-
-    /** 寮€濮� 鏄惁浣跨敤 (0.鍚︼紝1.鏄�)  */
-    private Integer usValidStart;
-
-    /** 缁撴潫 鏄惁浣跨敤 (0.鍚︼紝1.鏄�)  */
-    private Integer usValidEnd;
-
-    /** 澧炲姞 鏄惁浣跨敤 (0.鍚︼紝1.鏄�)  */
-    private Integer usValidIncrement;
-
-    /** 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> usValidList;
-
-    /** 寮€濮� 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isSecphoneStart;
-
-    /** 缁撴潫 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isSecphoneEnd;
-
-    /** 澧炲姞 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�)  */
-    private Integer isSecphoneIncrement;
-
-    /** 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> isSecphoneList;
-
-    /** 寮€濮� 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�)  */
-    private Integer isEnglishStart;
-
-    /** 缁撴潫 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�)  */
-    private Integer isEnglishEnd;
-
-    /** 澧炲姞 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�)  */
-    private Integer isEnglishIncrement;
-
-    /** 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 鍒楄〃 */
-    private List <Integer> isEnglishList;
-
-    /** 寮€濮� 鎺掑簭 */
-    private Integer sortStart;
-
-    /** 缁撴潫 鎺掑簭 */
-    private Integer sortEnd;
-
-    /** 澧炲姞 鎺掑簭 */
-    private Integer sortIncrement;
-
-    /** 鎺掑簭鍒楄〃 */
-    private List <Integer> sortList;
-
-    /** 寮€濮� 閮ㄩ棬鏉ユ簮 */
-    private Integer sourceStart;
-
-    /** 缁撴潫 閮ㄩ棬鏉ユ簮 */
-    private Integer sourceEnd;
-
-    /** 澧炲姞 閮ㄩ棬鏉ユ簮 */
-    private Integer sourceIncrement;
-
-    /** 閮ㄩ棬鏉ユ簮鍒楄〃 */
-    private List <Integer> sourceList;
-
-    /** 寮€濮� 鍒涘缓鏃堕棿 */
-    private String createTimeStart;
-
-    /** 缁撴潫 鍒涘缓鏃堕棿 */
-    private String createTimeEnd;
-
-    /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdStart;
-
-    /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdEnd;
-
-    /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdIncrement;
-
-    /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
-    private List <Long> createUserIdList;
-
-    /** 寮€濮� 淇敼鏃堕棿 */
-    private String updateTimeStart;
-
-    /** 缁撴潫 淇敼鏃堕棿 */
-    private String updateTimeEnd;
-
-
-    /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<DeptPdu> orConditionList;
-
-    /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<DeptPdu> andConditionList;
-
-    public DeptPdu(){}
-    /**
-    * 鑾峰彇 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d
-    * @return String
-    */
-    public String getTid(){
-        return tid;
-    }
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d
-    * @param tid
-    */
-    public void setTid(String tid){
-        this.tid = tid;
-    }
-    /**
-    * 鑾峰彇 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame
-    * @return String
-    */
-    public String getTname(){
-        return tname;
-    }
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame
-    * @param tname
-    */
-    public void setTname(String tname){
-        this.tname = tname;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬鍚嶇О
-    * @return String
-    */
-    public String getName(){
-        return name;
-    }
-    /**
-    * 璁剧疆 閮ㄩ棬鍚嶇О
-    * @param name
-    */
-    public void setName(String name){
-        this.name = name;
-    }
-    /**
-    * 鑾峰彇 浠庢斂鍔$郴缁熸潵鐨勫埆鍚�
-    * @return String
-    */
-    public String getSimpleName(){
-        return simpleName;
-    }
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勫埆鍚�
-    * @param simpleName
-    */
-    public void setSimpleName(String simpleName){
-        this.simpleName = simpleName;
-    }
-    /**
-    * 鑾峰彇 绔欑偣ID
-    * @return Long
-    */
-    public Long getSiteId(){
-        return siteId;
-    }
-    /**
-    * 璁剧疆 绔欑偣ID
-    * @param siteId
-    */
-    public void setSiteId(Long siteId){
-        this.siteId = siteId;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬绠€绉�
-    * @return String
-    */
-    public String getDeptAbb(){
-        return deptAbb;
-    }
-    /**
-    * 璁剧疆 閮ㄩ棬绠€绉�
-    * @param deptAbb
-    */
-    public void setDeptAbb(String deptAbb){
-        this.deptAbb = deptAbb;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬鐢佃瘽
-    * @return String
-    */
-    public String getDeptTelphone(){
-        return deptTelphone;
-    }
-    /**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽
-    * @param deptTelphone
-    */
-    public void setDeptTelphone(String deptTelphone){
-        this.deptTelphone = deptTelphone;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬缂栧彿
-    * @return String
-    */
-    public String getDeptNumber(){
-        return deptNumber;
-    }
-    /**
-    * 璁剧疆 閮ㄩ棬缂栧彿
-    * @param deptNumber
-    */
-    public void setDeptNumber(String deptNumber){
-        this.deptNumber = deptNumber;
-    }
-    /**
-    * 鑾峰彇 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getIsAutotable(){
-        return isAutotable;
-    }
-    /**
-    * 璁剧疆 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotable
-    */
-    public void setIsAutotable(Integer isAutotable){
-        this.isAutotable = isAutotable;
-    }
-    /**
-    * 鑾峰彇 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getIsOrder(){
-        return isOrder;
-    }
-    /**
-    * 璁剧疆 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrder
-    */
-    public void setIsOrder(Integer isOrder){
-        this.isOrder = isOrder;
-    }
-    /**
-    * 鑾峰彇 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getIsBkb(){
-        return isBkb;
-    }
-    /**
-    * 璁剧疆 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkb
-    */
-    public void setIsBkb(Integer isBkb){
-        this.isBkb = isBkb;
-    }
-    /**
-    * 鑾峰彇 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getIsWorkGuide(){
-        return isWorkGuide;
-    }
-    /**
-    * 璁剧疆 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuide
-    */
-    public void setIsWorkGuide(Integer isWorkGuide){
-        this.isWorkGuide = isWorkGuide;
-    }
-    /**
-    * 鑾峰彇 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getUsValid(){
-        return usValid;
-    }
-    /**
-    * 璁剧疆 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValid
-    */
-    public void setUsValid(Integer usValid){
-        this.usValid = usValid;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getIsSecphone(){
-        return isSecphone;
-    }
-    /**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphone
-    */
-    public void setIsSecphone(Integer isSecphone){
-        this.isSecphone = isSecphone;
-    }
-    /**
-    * 鑾峰彇 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @return Integer
-    */
-    public Integer getIsEnglish(){
-        return isEnglish;
-    }
-    /**
-    * 璁剧疆 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglish
-    */
-    public void setIsEnglish(Integer isEnglish){
-        this.isEnglish = isEnglish;
-    }
-    /**
-    * 鑾峰彇 鎺掑簭
-    * @return Integer
-    */
-    public Integer getSort(){
-        return sort;
-    }
-    /**
-    * 璁剧疆 鎺掑簭
-    * @param sort
-    */
-    public void setSort(Integer sort){
-        this.sort = sort;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬鏉ユ簮
-    * @return Integer
-    */
-    public Integer getSource(){
-        return source;
-    }
-    /**
-    * 璁剧疆 閮ㄩ棬鏉ユ簮
-    * @param source
-    */
-    public void setSource(Integer source){
-        this.source = source;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @return idStart
-    */
-    public Long getIdStart(){
-        return this.idStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
-    public void setIdStart(Long idStart){
-        this.idStart = idStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @return $idEnd
-    */
-    public Long getIdEnd(){
-        return this.idEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
-    public void setIdEnd(Long idEnd){
-        this.idEnd = idEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @return idIncrement
-    */
-    public Long getIdIncrement(){
-        return this.idIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
-    public void setIdIncrement(Long idIncrement){
-        this.idIncrement = idIncrement;
-    }
-
-    /**
-    * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-    * @return idList
-    */
-    public List<Long> getIdList(){
-        return this.idList;
-    }
-
-    /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
-    public void setIdList(List<Long> idList){
-        this.idList = idList;
-    }
-
-    /**
-    * 鑾峰彇 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d
-    * @return tidList
-    */
-    public List<String> getTidList(){
-        return this.tidList;
-    }
-
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d
-    * @param tidList
-    */
-    public void setTidList(List<String> tidList){
-        this.tidList = tidList;
-    }
-    /**
-    * 鑾峰彇 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame
-    * @return tnameList
-    */
-    public List<String> getTnameList(){
-        return this.tnameList;
-    }
-
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame
-    * @param tnameList
-    */
-    public void setTnameList(List<String> tnameList){
-        this.tnameList = tnameList;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬鍚嶇О
-    * @return nameList
-    */
-    public List<String> getNameList(){
-        return this.nameList;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鍚嶇О
-    * @param nameList
-    */
-    public void setNameList(List<String> nameList){
-        this.nameList = nameList;
-    }
-    /**
-    * 鑾峰彇 浠庢斂鍔$郴缁熸潵鐨勫埆鍚�
-    * @return simpleNameList
-    */
-    public List<String> getSimpleNameList(){
-        return this.simpleNameList;
-    }
-
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勫埆鍚�
-    * @param simpleNameList
-    */
-    public void setSimpleNameList(List<String> simpleNameList){
-        this.simpleNameList = simpleNameList;
-    }
-    /**
-    * 鑾峰彇 寮€濮� 绔欑偣ID
-    * @return siteIdStart
-    */
-    public Long getSiteIdStart(){
-        return this.siteIdStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 绔欑偣ID
-    * @param siteIdStart
-    */
-    public void setSiteIdStart(Long siteIdStart){
-        this.siteIdStart = siteIdStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 绔欑偣ID
-    * @return $siteIdEnd
-    */
-    public Long getSiteIdEnd(){
-        return this.siteIdEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 绔欑偣ID
-    * @param siteIdEnd
-    */
-    public void setSiteIdEnd(Long siteIdEnd){
-        this.siteIdEnd = siteIdEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 绔欑偣ID
-    * @return siteIdIncrement
-    */
-    public Long getSiteIdIncrement(){
-        return this.siteIdIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 绔欑偣ID
-    * @param siteIdIncrement
-    */
-    public void setSiteIdIncrement(Long siteIdIncrement){
-        this.siteIdIncrement = siteIdIncrement;
-    }
-
-    /**
-    * 鑾峰彇 绔欑偣ID
-    * @return siteIdList
-    */
-    public List<Long> getSiteIdList(){
-        return this.siteIdList;
-    }
-
-    /**
-    * 璁剧疆 绔欑偣ID
-    * @param siteIdList
-    */
-    public void setSiteIdList(List<Long> siteIdList){
-        this.siteIdList = siteIdList;
-    }
-
-    /**
-    * 鑾峰彇 閮ㄩ棬绠€绉�
-    * @return deptAbbList
-    */
-    public List<String> getDeptAbbList(){
-        return this.deptAbbList;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬绠€绉�
-    * @param deptAbbList
-    */
-    public void setDeptAbbList(List<String> deptAbbList){
-        this.deptAbbList = deptAbbList;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬鐢佃瘽
-    * @return deptTelphoneList
-    */
-    public List<String> getDeptTelphoneList(){
-        return this.deptTelphoneList;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽
-    * @param deptTelphoneList
-    */
-    public void setDeptTelphoneList(List<String> deptTelphoneList){
-        this.deptTelphoneList = deptTelphoneList;
-    }
-    /**
-    * 鑾峰彇 閮ㄩ棬缂栧彿
-    * @return deptNumberList
-    */
-    public List<String> getDeptNumberList(){
-        return this.deptNumberList;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬缂栧彿
-    * @param deptNumberList
-    */
-    public void setDeptNumberList(List<String> deptNumberList){
-        this.deptNumberList = deptNumberList;
-    }
-    /**
-    * 鑾峰彇 寮€濮� 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @return isAutotableStart
-    */
-    public Integer getIsAutotableStart(){
-        return this.isAutotableStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableStart
-    */
-    public void setIsAutotableStart(Integer isAutotableStart){
-        this.isAutotableStart = isAutotableStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @return $isAutotableEnd
-    */
-    public Integer getIsAutotableEnd(){
-        return this.isAutotableEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableEnd
-    */
-    public void setIsAutotableEnd(Integer isAutotableEnd){
-        this.isAutotableEnd = isAutotableEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @return isAutotableIncrement
-    */
-    public Integer getIsAutotableIncrement(){
-        return this.isAutotableIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableIncrement
-    */
-    public void setIsAutotableIncrement(Integer isAutotableIncrement){
-        this.isAutotableIncrement = isAutotableIncrement;
-    }
-
-    /**
-    * 鑾峰彇 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @return isAutotableList
-    */
-    public List<Integer> getIsAutotableList(){
-        return this.isAutotableList;
-    }
-
-    /**
-    * 璁剧疆 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableList
-    */
-    public void setIsAutotableList(List<Integer> isAutotableList){
-        this.isAutotableList = isAutotableList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isOrderStart
-    */
-    public Integer getIsOrderStart(){
-        return this.isOrderStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderStart
-    */
-    public void setIsOrderStart(Integer isOrderStart){
-        this.isOrderStart = isOrderStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return $isOrderEnd
-    */
-    public Integer getIsOrderEnd(){
-        return this.isOrderEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderEnd
-    */
-    public void setIsOrderEnd(Integer isOrderEnd){
-        this.isOrderEnd = isOrderEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isOrderIncrement
-    */
-    public Integer getIsOrderIncrement(){
-        return this.isOrderIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderIncrement
-    */
-    public void setIsOrderIncrement(Integer isOrderIncrement){
-        this.isOrderIncrement = isOrderIncrement;
-    }
-
-    /**
-    * 鑾峰彇 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isOrderList
-    */
-    public List<Integer> getIsOrderList(){
-        return this.isOrderList;
-    }
-
-    /**
-    * 璁剧疆 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderList
-    */
-    public void setIsOrderList(List<Integer> isOrderList){
-        this.isOrderList = isOrderList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @return isBkbStart
-    */
-    public Integer getIsBkbStart(){
-        return this.isBkbStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbStart
-    */
-    public void setIsBkbStart(Integer isBkbStart){
-        this.isBkbStart = isBkbStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @return $isBkbEnd
-    */
-    public Integer getIsBkbEnd(){
-        return this.isBkbEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbEnd
-    */
-    public void setIsBkbEnd(Integer isBkbEnd){
-        this.isBkbEnd = isBkbEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @return isBkbIncrement
-    */
-    public Integer getIsBkbIncrement(){
-        return this.isBkbIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbIncrement
-    */
-    public void setIsBkbIncrement(Integer isBkbIncrement){
-        this.isBkbIncrement = isBkbIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @return isBkbList
-    */
-    public List<Integer> getIsBkbList(){
-        return this.isBkbList;
-    }
-
-    /**
-    * 璁剧疆 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbList
-    */
-    public void setIsBkbList(List<Integer> isBkbList){
-        this.isBkbList = isBkbList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isWorkGuideStart
-    */
-    public Integer getIsWorkGuideStart(){
-        return this.isWorkGuideStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideStart
-    */
-    public void setIsWorkGuideStart(Integer isWorkGuideStart){
-        this.isWorkGuideStart = isWorkGuideStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return $isWorkGuideEnd
-    */
-    public Integer getIsWorkGuideEnd(){
-        return this.isWorkGuideEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideEnd
-    */
-    public void setIsWorkGuideEnd(Integer isWorkGuideEnd){
-        this.isWorkGuideEnd = isWorkGuideEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isWorkGuideIncrement
-    */
-    public Integer getIsWorkGuideIncrement(){
-        return this.isWorkGuideIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideIncrement
-    */
-    public void setIsWorkGuideIncrement(Integer isWorkGuideIncrement){
-        this.isWorkGuideIncrement = isWorkGuideIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isWorkGuideList
-    */
-    public List<Integer> getIsWorkGuideList(){
-        return this.isWorkGuideList;
-    }
-
-    /**
-    * 璁剧疆 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideList
-    */
-    public void setIsWorkGuideList(List<Integer> isWorkGuideList){
-        this.isWorkGuideList = isWorkGuideList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @return usValidStart
-    */
-    public Integer getUsValidStart(){
-        return this.usValidStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidStart
-    */
-    public void setUsValidStart(Integer usValidStart){
-        this.usValidStart = usValidStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @return $usValidEnd
-    */
-    public Integer getUsValidEnd(){
-        return this.usValidEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidEnd
-    */
-    public void setUsValidEnd(Integer usValidEnd){
-        this.usValidEnd = usValidEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @return usValidIncrement
-    */
-    public Integer getUsValidIncrement(){
-        return this.usValidIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidIncrement
-    */
-    public void setUsValidIncrement(Integer usValidIncrement){
-        this.usValidIncrement = usValidIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @return usValidList
-    */
-    public List<Integer> getUsValidList(){
-        return this.usValidList;
-    }
-
-    /**
-    * 璁剧疆 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidList
-    */
-    public void setUsValidList(List<Integer> usValidList){
-        this.usValidList = usValidList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isSecphoneStart
-    */
-    public Integer getIsSecphoneStart(){
-        return this.isSecphoneStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneStart
-    */
-    public void setIsSecphoneStart(Integer isSecphoneStart){
-        this.isSecphoneStart = isSecphoneStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return $isSecphoneEnd
-    */
-    public Integer getIsSecphoneEnd(){
-        return this.isSecphoneEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneEnd
-    */
-    public void setIsSecphoneEnd(Integer isSecphoneEnd){
-        this.isSecphoneEnd = isSecphoneEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isSecphoneIncrement
-    */
-    public Integer getIsSecphoneIncrement(){
-        return this.isSecphoneIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneIncrement
-    */
-    public void setIsSecphoneIncrement(Integer isSecphoneIncrement){
-        this.isSecphoneIncrement = isSecphoneIncrement;
-    }
-
-    /**
-    * 鑾峰彇 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @return isSecphoneList
-    */
-    public List<Integer> getIsSecphoneList(){
-        return this.isSecphoneList;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneList
-    */
-    public void setIsSecphoneList(List<Integer> isSecphoneList){
-        this.isSecphoneList = isSecphoneList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @return isEnglishStart
-    */
-    public Integer getIsEnglishStart(){
-        return this.isEnglishStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishStart
-    */
-    public void setIsEnglishStart(Integer isEnglishStart){
-        this.isEnglishStart = isEnglishStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @return $isEnglishEnd
-    */
-    public Integer getIsEnglishEnd(){
-        return this.isEnglishEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishEnd
-    */
-    public void setIsEnglishEnd(Integer isEnglishEnd){
-        this.isEnglishEnd = isEnglishEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @return isEnglishIncrement
-    */
-    public Integer getIsEnglishIncrement(){
-        return this.isEnglishIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishIncrement
-    */
-    public void setIsEnglishIncrement(Integer isEnglishIncrement){
-        this.isEnglishIncrement = isEnglishIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @return isEnglishList
-    */
-    public List<Integer> getIsEnglishList(){
-        return this.isEnglishList;
-    }
-
-    /**
-    * 璁剧疆 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishList
-    */
-    public void setIsEnglishList(List<Integer> isEnglishList){
-        this.isEnglishList = isEnglishList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鎺掑簭
-    * @return sortStart
-    */
-    public Integer getSortStart(){
-        return this.sortStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鎺掑簭
-    * @param sortStart
-    */
-    public void setSortStart(Integer sortStart){
-        this.sortStart = sortStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鎺掑簭
-    * @return $sortEnd
-    */
-    public Integer getSortEnd(){
-        return this.sortEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鎺掑簭
-    * @param sortEnd
-    */
-    public void setSortEnd(Integer sortEnd){
-        this.sortEnd = sortEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鎺掑簭
-    * @return sortIncrement
-    */
-    public Integer getSortIncrement(){
-        return this.sortIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鎺掑簭
-    * @param sortIncrement
-    */
-    public void setSortIncrement(Integer sortIncrement){
-        this.sortIncrement = sortIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鎺掑簭
-    * @return sortList
-    */
-    public List<Integer> getSortList(){
-        return this.sortList;
-    }
-
-    /**
-    * 璁剧疆 鎺掑簭
-    * @param sortList
-    */
-    public void setSortList(List<Integer> sortList){
-        this.sortList = sortList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 閮ㄩ棬鏉ユ簮
-    * @return sourceStart
-    */
-    public Integer getSourceStart(){
-        return this.sourceStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 閮ㄩ棬鏉ユ簮
-    * @param sourceStart
-    */
-    public void setSourceStart(Integer sourceStart){
-        this.sourceStart = sourceStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 閮ㄩ棬鏉ユ簮
-    * @return $sourceEnd
-    */
-    public Integer getSourceEnd(){
-        return this.sourceEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 閮ㄩ棬鏉ユ簮
-    * @param sourceEnd
-    */
-    public void setSourceEnd(Integer sourceEnd){
-        this.sourceEnd = sourceEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 閮ㄩ棬鏉ユ簮
-    * @return sourceIncrement
-    */
-    public Integer getSourceIncrement(){
-        return this.sourceIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 閮ㄩ棬鏉ユ簮
-    * @param sourceIncrement
-    */
-    public void setSourceIncrement(Integer sourceIncrement){
-        this.sourceIncrement = sourceIncrement;
-    }
-
-    /**
-    * 鑾峰彇 閮ㄩ棬鏉ユ簮
-    * @return sourceList
-    */
-    public List<Integer> getSourceList(){
-        return this.sourceList;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鏉ユ簮
-    * @param sourceList
-    */
-    public void setSourceList(List<Integer> sourceList){
-        this.sourceList = sourceList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
-    public String getCreateTimeStart(){
-        return this.createTimeStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
-    public void setCreateTimeStart(String createTimeStart){
-        this.createTimeStart = createTimeStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
-    public String getCreateTimeEnd(){
-        return this.createTimeEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
-    public void setCreateTimeEnd(String createTimeEnd){
-        this.createTimeEnd = createTimeEnd;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
-    public Long getCreateUserIdStart(){
-        return this.createUserIdStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
-    public void setCreateUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
-    public Long getCreateUserIdEnd(){
-        return this.createUserIdEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
-    public void setCreateUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
-    public Long getCreateUserIdIncrement(){
-        return this.createUserIdIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
-    public void setCreateUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
-    public List<Long> getCreateUserIdList(){
-        return this.createUserIdList;
-    }
-
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
-    public void setCreateUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 淇敼鏃堕棿
-    * @return updateTimeStart
-    */
-    public String getUpdateTimeStart(){
-        return this.updateTimeStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 淇敼鏃堕棿
-    * @param updateTimeStart
-    */
-    public void setUpdateTimeStart(String updateTimeStart){
-        this.updateTimeStart = updateTimeStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 淇敼鏃堕棿
-    * @return updateTimeEnd
-    */
-    public String getUpdateTimeEnd(){
-        return this.updateTimeEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 淇敼鏃堕棿
-    * @param updateTimeEnd
-    */
-    public void setUpdateTimeEnd(String updateTimeEnd){
-        this.updateTimeEnd = updateTimeEnd;
-    }
-
-    /**
-    * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
-    * @param id
-    */
-    public DeptPdu id(Long id){
-	    setId(id);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-    * @param idStart
-    */
-    public DeptPdu idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
-    public DeptPdu idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
-    public DeptPdu idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-    * @param idList
-    */
-    public DeptPdu idList(List<Long> idList){
-        this.idList = idList;
-		return this;
-        }
-
-
-	/**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d
-    * @param tid
-    */
-    public DeptPdu tid(String tid){
-        setTid(tid);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╥d
-    * @param tidList
-    */
-    public DeptPdu tidList(List<String> tidList){
-        this.tidList = tidList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame
-    * @param tname
-    */
-    public DeptPdu tname(String tname){
-        setTname(tname);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勯儴闂╪ame
-    * @param tnameList
-    */
-    public DeptPdu tnameList(List<String> tnameList){
-        this.tnameList = tnameList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 閮ㄩ棬鍚嶇О
-    * @param name
-    */
-    public DeptPdu name(String name){
-        setName(name);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鍚嶇О
-    * @param nameList
-    */
-    public DeptPdu nameList(List<String> nameList){
-        this.nameList = nameList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勫埆鍚�
-    * @param simpleName
-    */
-    public DeptPdu simpleName(String simpleName){
-        setSimpleName(simpleName);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 浠庢斂鍔$郴缁熸潵鐨勫埆鍚�
-    * @param simpleNameList
-    */
-    public DeptPdu simpleNameList(List<String> simpleNameList){
-        this.simpleNameList = simpleNameList;
-		return this;
-    }
-
-    /**
-    * 璁剧疆  绔欑偣ID
-    * @param siteId
-    */
-    public DeptPdu siteId(Long siteId){
-	    setSiteId(siteId);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 绔欑偣ID
-    * @param siteIdStart
-    */
-    public DeptPdu siteIdStart(Long siteIdStart){
-		this.siteIdStart = siteIdStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 绔欑偣ID
-    * @param siteIdEnd
-    */
-    public DeptPdu siteIdEnd(Long siteIdEnd){
-		this.siteIdEnd = siteIdEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 绔欑偣ID
-    * @param siteIdIncrement
-    */
-    public DeptPdu siteIdIncrement(Long siteIdIncrement){
-		this.siteIdIncrement = siteIdIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 绔欑偣ID
-    * @param siteIdList
-    */
-    public DeptPdu siteIdList(List<Long> siteIdList){
-        this.siteIdList = siteIdList;
-		return this;
-        }
-
-
-	/**
-    * 璁剧疆 閮ㄩ棬绠€绉�
-    * @param deptAbb
-    */
-    public DeptPdu deptAbb(String deptAbb){
-        setDeptAbb(deptAbb);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬绠€绉�
-    * @param deptAbbList
-    */
-    public DeptPdu deptAbbList(List<String> deptAbbList){
-        this.deptAbbList = deptAbbList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽
-    * @param deptTelphone
-    */
-    public DeptPdu deptTelphone(String deptTelphone){
-        setDeptTelphone(deptTelphone);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽
-    * @param deptTelphoneList
-    */
-    public DeptPdu deptTelphoneList(List<String> deptTelphoneList){
-        this.deptTelphoneList = deptTelphoneList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 閮ㄩ棬缂栧彿
-    * @param deptNumber
-    */
-    public DeptPdu deptNumber(String deptNumber){
-        setDeptNumber(deptNumber);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬缂栧彿
-    * @param deptNumberList
-    */
-    public DeptPdu deptNumberList(List<String> deptNumberList){
-        this.deptNumberList = deptNumberList;
-		return this;
-    }
-
-    /**
-    * 璁剧疆  濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotable
-    */
-    public DeptPdu isAutotable(Integer isAutotable){
-	    setIsAutotable(isAutotable);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableStart
-    */
-    public DeptPdu isAutotableStart(Integer isAutotableStart){
-		this.isAutotableStart = isAutotableStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableEnd
-    */
-    public DeptPdu isAutotableEnd(Integer isAutotableEnd){
-		this.isAutotableEnd = isAutotableEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableIncrement
-    */
-    public DeptPdu isAutotableIncrement(Integer isAutotableIncrement){
-		this.isAutotableIncrement = isAutotableIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 濉崟鏈哄睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isAutotableList
-    */
-    public DeptPdu isAutotableList(List<Integer> isAutotableList){
-        this.isAutotableList = isAutotableList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrder
-    */
-    public DeptPdu isOrder(Integer isOrder){
-	    setIsOrder(isOrder);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderStart
-    */
-    public DeptPdu isOrderStart(Integer isOrderStart){
-		this.isOrderStart = isOrderStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderEnd
-    */
-    public DeptPdu isOrderEnd(Integer isOrderEnd){
-		this.isOrderEnd = isOrderEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderIncrement
-    */
-    public DeptPdu isOrderIncrement(Integer isOrderIncrement){
-		this.isOrderIncrement = isOrderIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 棰勭害灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isOrderList
-    */
-    public DeptPdu isOrderList(List<Integer> isOrderList){
-        this.isOrderList = isOrderList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkb
-    */
-    public DeptPdu isBkb(Integer isBkb){
-	    setIsBkb(isBkb);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbStart
-    */
-    public DeptPdu isBkbStart(Integer isBkbStart){
-		this.isBkbStart = isBkbStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbEnd
-    */
-    public DeptPdu isBkbEnd(Integer isBkbEnd){
-		this.isBkbEnd = isBkbEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbIncrement
-    */
-    public DeptPdu isBkbIncrement(Integer isBkbIncrement){
-		this.isBkbIncrement = isBkbIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鑳岄潬鑳屽睍绀� (0.鍚︼紝1.鏄�) 
-    * @param isBkbList
-    */
-    public DeptPdu isBkbList(List<Integer> isBkbList){
-        this.isBkbList = isBkbList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuide
-    */
-    public DeptPdu isWorkGuide(Integer isWorkGuide){
-	    setIsWorkGuide(isWorkGuide);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideStart
-    */
-    public DeptPdu isWorkGuideStart(Integer isWorkGuideStart){
-		this.isWorkGuideStart = isWorkGuideStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideEnd
-    */
-    public DeptPdu isWorkGuideEnd(Integer isWorkGuideEnd){
-		this.isWorkGuideEnd = isWorkGuideEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideIncrement
-    */
-    public DeptPdu isWorkGuideIncrement(Integer isWorkGuideIncrement){
-		this.isWorkGuideIncrement = isWorkGuideIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鍔炰簨鎸囧崡灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isWorkGuideList
-    */
-    public DeptPdu isWorkGuideList(List<Integer> isWorkGuideList){
-        this.isWorkGuideList = isWorkGuideList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValid
-    */
-    public DeptPdu usValid(Integer usValid){
-	    setUsValid(usValid);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidStart
-    */
-    public DeptPdu usValidStart(Integer usValidStart){
-		this.usValidStart = usValidStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidEnd
-    */
-    public DeptPdu usValidEnd(Integer usValidEnd){
-		this.usValidEnd = usValidEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidIncrement
-    */
-    public DeptPdu usValidIncrement(Integer usValidIncrement){
-		this.usValidIncrement = usValidIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鏄惁浣跨敤 (0.鍚︼紝1.鏄�) 
-    * @param usValidList
-    */
-    public DeptPdu usValidList(List<Integer> usValidList){
-        this.usValidList = usValidList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphone
-    */
-    public DeptPdu isSecphone(Integer isSecphone){
-	    setIsSecphone(isSecphone);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneStart
-    */
-    public DeptPdu isSecphoneStart(Integer isSecphoneStart){
-		this.isSecphoneStart = isSecphoneStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneEnd
-    */
-    public DeptPdu isSecphoneEnd(Integer isSecphoneEnd){
-		this.isSecphoneEnd = isSecphoneEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneIncrement
-    */
-    public DeptPdu isSecphoneIncrement(Integer isSecphoneIncrement){
-		this.isSecphoneIncrement = isSecphoneIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鐢佃瘽鏄惁灞曠ず (0.鍚︼紝1.鏄�) 
-    * @param isSecphoneList
-    */
-    public DeptPdu isSecphoneList(List<Integer> isSecphoneList){
-        this.isSecphoneList = isSecphoneList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglish
-    */
-    public DeptPdu isEnglish(Integer isEnglish){
-	    setIsEnglish(isEnglish);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishStart
-    */
-    public DeptPdu isEnglishStart(Integer isEnglishStart){
-		this.isEnglishStart = isEnglishStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishEnd
-    */
-    public DeptPdu isEnglishEnd(Integer isEnglishEnd){
-		this.isEnglishEnd = isEnglishEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishIncrement
-    */
-    public DeptPdu isEnglishIncrement(Integer isEnglishIncrement){
-		this.isEnglishIncrement = isEnglishIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鏄惁灞曠ず鑻辨枃 (0.鍚︼紝1.鏄�) 
-    * @param isEnglishList
-    */
-    public DeptPdu isEnglishList(List<Integer> isEnglishList){
-        this.isEnglishList = isEnglishList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  鎺掑簭
-    * @param sort
-    */
-    public DeptPdu sort(Integer sort){
-	    setSort(sort);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鎺掑簭
-    * @param sortStart
-    */
-    public DeptPdu sortStart(Integer sortStart){
-		this.sortStart = sortStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鎺掑簭
-    * @param sortEnd
-    */
-    public DeptPdu sortEnd(Integer sortEnd){
-		this.sortEnd = sortEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鎺掑簭
-    * @param sortIncrement
-    */
-    public DeptPdu sortIncrement(Integer sortIncrement){
-		this.sortIncrement = sortIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鎺掑簭
-    * @param sortList
-    */
-    public DeptPdu sortList(List<Integer> sortList){
-        this.sortList = sortList;
-		return this;
-        }
-
-    /**
-    * 璁剧疆  閮ㄩ棬鏉ユ簮
-    * @param source
-    */
-    public DeptPdu source(Integer source){
-	    setSource(source);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 閮ㄩ棬鏉ユ簮
-    * @param sourceStart
-    */
-    public DeptPdu sourceStart(Integer sourceStart){
-		this.sourceStart = sourceStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 閮ㄩ棬鏉ユ簮
-    * @param sourceEnd
-    */
-    public DeptPdu sourceEnd(Integer sourceEnd){
-		this.sourceEnd = sourceEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 閮ㄩ棬鏉ユ簮
-    * @param sourceIncrement
-    */
-    public DeptPdu sourceIncrement(Integer sourceIncrement){
-		this.sourceIncrement = sourceIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 閮ㄩ棬鏉ユ簮
-    * @param sourceList
-    */
-    public DeptPdu sourceList(List<Integer> sourceList){
-        this.sourceList = sourceList;
-		return this;
-        }
-
-
-    /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
-    public DeptPdu createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
-    public DeptPdu createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
-    public DeptPdu createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
-    public DeptPdu createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
-    public DeptPdu createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-
-
-/**
-    * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
-    public List<DeptPdu> getOrConditionList(){
-    return this.orConditionList;
-    }
-
-    /**
-    * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
-    public void setOrConditionList(List<DeptPdu> orConditionList){
-        this.orConditionList = orConditionList;
-    }
-
-    /**
-    * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
-    public List<DeptPdu> getAndConditionList(){
-        return this.andConditionList;
-    }
-
-    /**
-    * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
-    public void setAndConditionList(List<DeptPdu> andConditionList){
-        this.andConditionList = andConditionList;
-    }
-
-    @Override
-    public int hashCode() {
-         return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof DeptPdu) {
-            DeptPdu tmp = (DeptPdu) obj;
-            if (this.getId() == tmp.getId()) {
-                 return true;
-            }
-        }
-        return false;
-    }
-
-    public void initAttrValue(){
-
-            this.tid = null;
-
-            this.tname = null;
-
-            this.name = null;
-
-            this.simpleName = null;
-
-            this.siteId = null;
-
-            this.deptAbb = null;
-
-            this.deptTelphone = null;
-
-            this.deptNumber = null;
-
-            this.isAutotable = 1;
-
-            this.isOrder = 1;
-
-            this.isBkb = 1;
-
-            this.isWorkGuide = 1;
-
-            this.usValid = 1;
-
-            this.isSecphone = 1;
-
-            this.isEnglish = 1;
-
-            this.sort = 0;
-
-            this.source = 0;
-    }
 }
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
index 33f7743b6d02a425a424796cac826a15002216b5..207cd7a8084126e77d7d6d23660e34b914169523 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SitePdu.java
@@ -1,54 +1,49 @@
 package com.mortals.xhx.common.pdu.site;
 
 import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
  * 绔欑偣Pdu瀵硅薄
  *
  * @author zxfei
- * @date 2022-07-14
+ * @date 2024-09-23
  */
-
+@Data
 public class SitePdu extends BaseEntityLong {
     private static final long serialVersionUID = 1L;
+
+    /** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
+    private List<Long> idList;
+
+
     /**
      * 绔欑偣鍚嶇О
      */
     private String siteName;
     /**
-     * 鐖剁骇id,榛樿0
+     * 绔欑偣缂栧彿
      */
-    private Long parentId;
+    private String siteCode;
     /**
-     * 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
+     * 鍖哄煙Id
      */
-    private String ancestors;
+    private String areaID;
     /**
      * 鍖哄煙缂栧彿
      */
-    private String regionCode;
-    /**
-     * 鏍囪瘑ID
-     */
-    private String iid;
+    private String areaCode;
     /**
-     * 绔欑偣缂栧彿
+     * 鍖哄煙鍚嶇О
      */
-    private String siteCode;
+    private String areaName;
     /**
      * 鐪佺紪鐮�
      */
     private String proCode;
-    /**
-     * 鍖哄煙ID
-     */
-    private String areaID;
-    /**
-     * 鍖哄煙缂栫爜
-     */
-    private String areaCode;
     /**
      * 甯傜紪鐮�
      */
@@ -73,10 +68,6 @@ public class SitePdu extends BaseEntityLong {
      * 绾害
      */
     private String latitude;
-    /**
-     * 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     */
-    private String haveSonArea;
     /**
      * 涓績鑱旂郴鐢佃瘽
      */
@@ -92,27 +83,19 @@ public class SitePdu extends BaseEntityLong {
     /**
      * 涓婂崍涓婄彮寮€濮嬫椂闂�
      */
-    private String amWorkStartTime;
+    private Date amWorkStartTime;
     /**
      * 涓婂崍涓婄彮缁撴潫鏃堕棿
      */
-    private String amWorkEndTime;
+    private Date amWorkEndTime;
     /**
      * 涓嬪崍涓婄彮寮€濮嬫椂闂�
      */
-    private String pmWorkStartTime;
+    private Date pmWorkStartTime;
     /**
      * 涓嬪崍涓婄彮缁撴潫鏃堕棿
      */
-    private String pmWorkEndTime;
-    /**
-     * 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     */
-    private Integer averageTime;
-    /**
-     * 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     */
-    private Integer waitingNumber;
+    private Date pmWorkEndTime;
     /**
      * 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
      */
@@ -150,19 +133,11 @@ public class SitePdu extends BaseEntityLong {
      */
     private Integer building;
     /**
-     * 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     */
-    private Integer isSite;
-    /**
-     * 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     */
-    private Integer status;
-    /**
-     * 璁惧logo鍦板潃
+     * logo鍥剧墖鍦板潃
      */
     private String logoPath;
     /**
-     * 绔欑偣鑻辨枃鍚嶇О
+     * 鑻辨枃鍚嶇О
      */
     private String englishName;
     /**
@@ -178,3733 +153,4 @@ public class SitePdu extends BaseEntityLong {
      */
     private String modelIds;
 
-    /** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
-    private Long idStart;
-
-    /** 缁撴潫 搴忓彿锛屼富閿紝鑷闀� */
-    private Long idEnd;
-
-    /** 澧炲姞 搴忓彿锛屼富閿紝鑷闀� */
-    private Long idIncrement;
-
-    /** 搴忓彿锛屼富閿紝鑷闀垮垪琛� */
-    private List <Long> idList;
-
-    /** 绔欑偣鍚嶇О */
-    private List<String> siteNameList;
-
-    /** 寮€濮� 鐖剁骇id,榛樿0 */
-    private Long parentIdStart;
-
-    /** 缁撴潫 鐖剁骇id,榛樿0 */
-    private Long parentIdEnd;
-
-    /** 澧炲姞 鐖剁骇id,榛樿0 */
-    private Long parentIdIncrement;
-
-    /** 鐖剁骇id,榛樿0鍒楄〃 */
-    private List <Long> parentIdList;
-
-    /** 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧 */
-    private List<String> ancestorsList;
-
-    /** 鍖哄煙缂栧彿 */
-    private List<String> regionCodeList;
-
-    /** 鏍囪瘑ID */
-    private List<String> iidList;
-
-    /** 绔欑偣缂栧彿 */
-    private List<String> siteCodeList;
-
-    /** 鐪佺紪鐮� */
-    private List<String> proCodeList;
-
-    /** 鍖哄煙ID */
-    private List<String> areaIDList;
-
-    /** 鍖哄煙缂栫爜 */
-    private List<String> areaCodeList;
-
-    /** 甯傜紪鐮� */
-    private List<String> cityCodeList;
-
-    /** 鍖虹紪鐮� */
-    private List<String> districtCodeList;
-
-    /** 绔欑偣鏈嶅姟鍣╥p */
-    private List<String> siteIpList;
-
-    /** 绔欑偣鏈嶅姟鍣ㄧ鍙� */
-    private List<String> sitePortList;
-
-    /** 缁忓害 */
-    private List<String> longitudeList;
-
-    /** 绾害 */
-    private List<String> latitudeList;
-
-    /** 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�) */
-    private List<String> haveSonAreaList;
-
-    /** 涓績鑱旂郴鐢佃瘽 */
-    private List<String> siteTelList;
-
-    /** 涓績璇︾粏鍦板潃 */
-    private List<String> detailAddressList;
-
-    /** 涓績浠嬬粛 */
-    private List<String> siteRemarkList;
-
-    /** 涓婂崍涓婄彮寮€濮嬫椂闂� */
-    private List<String> amWorkStartTimeList;
-
-    /** 涓婂崍涓婄彮缁撴潫鏃堕棿 */
-    private List<String> amWorkEndTimeList;
-
-    /** 涓嬪崍涓婄彮寮€濮嬫椂闂� */
-    private List<String> pmWorkStartTimeList;
-
-    /** 涓嬪崍涓婄彮缁撴潫鏃堕棿 */
-    private List<String> pmWorkEndTimeList;
-
-    /** 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎 */
-    private Integer averageTimeStart;
-
-    /** 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎 */
-    private Integer averageTimeEnd;
-
-    /** 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎 */
-    private Integer averageTimeIncrement;
-
-    /** 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎鍒楄〃 */
-    private List <Integer> averageTimeList;
-
-    /** 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎 */
-    private Integer waitingNumberStart;
-
-    /** 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎 */
-    private Integer waitingNumberEnd;
-
-    /** 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎 */
-    private Integer waitingNumberIncrement;
-
-    /** 绛夊緟浜烘暟,鍚庢湡鍒犻櫎鍒楄〃 */
-    private List <Integer> waitingNumberList;
-
-    /** 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday1Start;
-
-    /** 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday1End;
-
-    /** 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday1Increment;
-
-    /** 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday1List;
-
-    /** 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday2Start;
-
-    /** 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday2End;
-
-    /** 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday2Increment;
-
-    /** 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday2List;
-
-    /** 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday3Start;
-
-    /** 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday3End;
-
-    /** 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday3Increment;
-
-    /** 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday3List;
-
-    /** 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday4Start;
-
-    /** 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday4End;
-
-    /** 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday4Increment;
-
-    /** 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday4List;
-
-    /** 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday5Start;
-
-    /** 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday5End;
-
-    /** 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday5Increment;
-
-    /** 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday5List;
-
-    /** 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday6Start;
-
-    /** 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday6End;
-
-    /** 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday6Increment;
-
-    /** 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday6List;
-
-    /** 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday7Start;
-
-    /** 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday7End;
-
-    /** 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂) */
-    private Integer workday7Increment;
-
-    /** 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)鍒楄〃 */
-    private List <Integer> workday7List;
-
-    /** 寮€濮� 妤煎眰 */
-    private Integer levelStart;
-
-    /** 缁撴潫 妤煎眰 */
-    private Integer levelEnd;
-
-    /** 澧炲姞 妤煎眰 */
-    private Integer levelIncrement;
-
-    /** 妤煎眰鍒楄〃 */
-    private List <Integer> levelList;
-
-    /** 寮€濮� 妤兼爧 */
-    private Integer buildingStart;
-
-    /** 缁撴潫 妤兼爧 */
-    private Integer buildingEnd;
-
-    /** 澧炲姞 妤兼爧 */
-    private Integer buildingIncrement;
-
-    /** 妤兼爧鍒楄〃 */
-    private List <Integer> buildingList;
-
-    /** 寮€濮� 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�) */
-    private Integer isSiteStart;
-
-    /** 缁撴潫 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�) */
-    private Integer isSiteEnd;
-
-    /** 澧炲姞 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�) */
-    private Integer isSiteIncrement;
-
-    /** 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)鍒楄〃 */
-    private List <Integer> isSiteList;
-
-    /** 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父) */
-    private Integer statusStart;
-
-    /** 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父) */
-    private Integer statusEnd;
-
-    /** 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父) */
-    private Integer statusIncrement;
-
-    /** 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)鍒楄〃 */
-    private List <Integer> statusList;
-
-    /** 璁惧logo鍦板潃 */
-    private List<String> logoPathList;
-
-    /** 绔欑偣鑻辨枃鍚嶇О */
-    private List<String> englishNameList;
-
-    /** 璐熻矗浜� */
-    private List<String> leadingOfficialList;
-
-    /** 鑱旂郴鐢佃瘽 */
-    private List<String> leadingOfficialTelephoneList;
-
-    /** 寮€濮� 鍒涘缓鏃堕棿 */
-    private String createTimeStart;
-
-    /** 缁撴潫 鍒涘缓鏃堕棿 */
-    private String createTimeEnd;
-
-    /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdStart;
-
-    /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdEnd;
-
-    /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdIncrement;
-
-    /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
-    private List <Long> createUserIdList;
-
-    /** 寮€濮� 淇敼鏃堕棿 */
-    private String updateTimeStart;
-
-    /** 缁撴潫 淇敼鏃堕棿 */
-    private String updateTimeEnd;
-
-    /** 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧 */
-    private List<String> modelIdsList;
-
-
-    /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<SitePdu> orConditionList;
-
-    /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<SitePdu> andConditionList;
-
-    public SitePdu(){}
-    /**
-     * 鑾峰彇 绔欑偣鍚嶇О
-     * @return String
-     */
-    public String getSiteName(){
-        return siteName;
-    }
-    /**
-     * 璁剧疆 绔欑偣鍚嶇О
-     * @param siteName
-     */
-    public void setSiteName(String siteName){
-        this.siteName = siteName;
-    }
-    /**
-     * 鑾峰彇 鐖剁骇id,榛樿0
-     * @return Long
-     */
-    public Long getParentId(){
-        return parentId;
-    }
-    /**
-     * 璁剧疆 鐖剁骇id,榛樿0
-     * @param parentId
-     */
-    public void setParentId(Long parentId){
-        this.parentId = parentId;
-    }
-    /**
-     * 鑾峰彇 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-     * @return String
-     */
-    public String getAncestors(){
-        return ancestors;
-    }
-    /**
-     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-     * @param ancestors
-     */
-    public void setAncestors(String ancestors){
-        this.ancestors = ancestors;
-    }
-    /**
-     * 鑾峰彇 鍖哄煙缂栧彿
-     * @return String
-     */
-    public String getRegionCode(){
-        return regionCode;
-    }
-    /**
-     * 璁剧疆 鍖哄煙缂栧彿
-     * @param regionCode
-     */
-    public void setRegionCode(String regionCode){
-        this.regionCode = regionCode;
-    }
-    /**
-     * 鑾峰彇 鏍囪瘑ID
-     * @return String
-     */
-    public String getIid(){
-        return iid;
-    }
-    /**
-     * 璁剧疆 鏍囪瘑ID
-     * @param iid
-     */
-    public void setIid(String iid){
-        this.iid = iid;
-    }
-    /**
-     * 鑾峰彇 绔欑偣缂栧彿
-     * @return String
-     */
-    public String getSiteCode(){
-        return siteCode;
-    }
-    /**
-     * 璁剧疆 绔欑偣缂栧彿
-     * @param siteCode
-     */
-    public void setSiteCode(String siteCode){
-        this.siteCode = siteCode;
-    }
-    /**
-     * 鑾峰彇 鐪佺紪鐮�
-     * @return String
-     */
-    public String getProCode(){
-        return proCode;
-    }
-    /**
-     * 璁剧疆 鐪佺紪鐮�
-     * @param proCode
-     */
-    public void setProCode(String proCode){
-        this.proCode = proCode;
-    }
-    /**
-     * 鑾峰彇 鍖哄煙ID
-     * @return String
-     */
-    public String getAreaID(){
-        return areaID;
-    }
-    /**
-     * 璁剧疆 鍖哄煙ID
-     * @param areaID
-     */
-    public void setAreaID(String areaID){
-        this.areaID = areaID;
-    }
-    /**
-     * 鑾峰彇 鍖哄煙缂栫爜
-     * @return String
-     */
-    public String getAreaCode(){
-        return areaCode;
-    }
-    /**
-     * 璁剧疆 鍖哄煙缂栫爜
-     * @param areaCode
-     */
-    public void setAreaCode(String areaCode){
-        this.areaCode = areaCode;
-    }
-    /**
-     * 鑾峰彇 甯傜紪鐮�
-     * @return String
-     */
-    public String getCityCode(){
-        return cityCode;
-    }
-    /**
-     * 璁剧疆 甯傜紪鐮�
-     * @param cityCode
-     */
-    public void setCityCode(String cityCode){
-        this.cityCode = cityCode;
-    }
-    /**
-     * 鑾峰彇 鍖虹紪鐮�
-     * @return String
-     */
-    public String getDistrictCode(){
-        return districtCode;
-    }
-    /**
-     * 璁剧疆 鍖虹紪鐮�
-     * @param districtCode
-     */
-    public void setDistrictCode(String districtCode){
-        this.districtCode = districtCode;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鏈嶅姟鍣╥p
-     * @return String
-     */
-    public String getSiteIp(){
-        return siteIp;
-    }
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
-     * @param siteIp
-     */
-    public void setSiteIp(String siteIp){
-        this.siteIp = siteIp;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鏈嶅姟鍣ㄧ鍙�
-     * @return String
-     */
-    public String getSitePort(){
-        return sitePort;
-    }
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
-     * @param sitePort
-     */
-    public void setSitePort(String sitePort){
-        this.sitePort = sitePort;
-    }
-    /**
-     * 鑾峰彇 缁忓害
-     * @return String
-     */
-    public String getLongitude(){
-        return longitude;
-    }
-    /**
-     * 璁剧疆 缁忓害
-     * @param longitude
-     */
-    public void setLongitude(String longitude){
-        this.longitude = longitude;
-    }
-    /**
-     * 鑾峰彇 绾害
-     * @return String
-     */
-    public String getLatitude(){
-        return latitude;
-    }
-    /**
-     * 璁剧疆 绾害
-     * @param latitude
-     */
-    public void setLatitude(String latitude){
-        this.latitude = latitude;
-    }
-    /**
-     * 鑾峰彇 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     * @return String
-     */
-    public String getHaveSonArea(){
-        return haveSonArea;
-    }
-    /**
-     * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     * @param haveSonArea
-     */
-    public void setHaveSonArea(String haveSonArea){
-        this.haveSonArea = haveSonArea;
-    }
-    /**
-     * 鑾峰彇 涓績鑱旂郴鐢佃瘽
-     * @return String
-     */
-    public String getSiteTel(){
-        return siteTel;
-    }
-    /**
-     * 璁剧疆 涓績鑱旂郴鐢佃瘽
-     * @param siteTel
-     */
-    public void setSiteTel(String siteTel){
-        this.siteTel = siteTel;
-    }
-    /**
-     * 鑾峰彇 涓績璇︾粏鍦板潃
-     * @return String
-     */
-    public String getDetailAddress(){
-        return detailAddress;
-    }
-    /**
-     * 璁剧疆 涓績璇︾粏鍦板潃
-     * @param detailAddress
-     */
-    public void setDetailAddress(String detailAddress){
-        this.detailAddress = detailAddress;
-    }
-    /**
-     * 鑾峰彇 涓績浠嬬粛
-     * @return String
-     */
-    public String getSiteRemark(){
-        return siteRemark;
-    }
-    /**
-     * 璁剧疆 涓績浠嬬粛
-     * @param siteRemark
-     */
-    public void setSiteRemark(String siteRemark){
-        this.siteRemark = siteRemark;
-    }
-    /**
-     * 鑾峰彇 涓婂崍涓婄彮寮€濮嬫椂闂�
-     * @return String
-     */
-    public String getAmWorkStartTime(){
-        return amWorkStartTime;
-    }
-    /**
-     * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
-     * @param amWorkStartTime
-     */
-    public void setAmWorkStartTime(String amWorkStartTime){
-        this.amWorkStartTime = amWorkStartTime;
-    }
-    /**
-     * 鑾峰彇 涓婂崍涓婄彮缁撴潫鏃堕棿
-     * @return String
-     */
-    public String getAmWorkEndTime(){
-        return amWorkEndTime;
-    }
-    /**
-     * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
-     * @param amWorkEndTime
-     */
-    public void setAmWorkEndTime(String amWorkEndTime){
-        this.amWorkEndTime = amWorkEndTime;
-    }
-    /**
-     * 鑾峰彇 涓嬪崍涓婄彮寮€濮嬫椂闂�
-     * @return String
-     */
-    public String getPmWorkStartTime(){
-        return pmWorkStartTime;
-    }
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
-     * @param pmWorkStartTime
-     */
-    public void setPmWorkStartTime(String pmWorkStartTime){
-        this.pmWorkStartTime = pmWorkStartTime;
-    }
-    /**
-     * 鑾峰彇 涓嬪崍涓婄彮缁撴潫鏃堕棿
-     * @return String
-     */
-    public String getPmWorkEndTime(){
-        return pmWorkEndTime;
-    }
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
-     * @param pmWorkEndTime
-     */
-    public void setPmWorkEndTime(String pmWorkEndTime){
-        this.pmWorkEndTime = pmWorkEndTime;
-    }
-    /**
-     * 鑾峰彇 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @return Integer
-     */
-    public Integer getAverageTime(){
-        return averageTime;
-    }
-    /**
-     * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTime
-     */
-    public void setAverageTime(Integer averageTime){
-        this.averageTime = averageTime;
-    }
-    /**
-     * 鑾峰彇 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @return Integer
-     */
-    public Integer getWaitingNumber(){
-        return waitingNumber;
-    }
-    /**
-     * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumber
-     */
-    public void setWaitingNumber(Integer waitingNumber){
-        this.waitingNumber = waitingNumber;
-    }
-    /**
-     * 鑾峰彇 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday1(){
-        return workday1;
-    }
-    /**
-     * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1
-     */
-    public void setWorkday1(Integer workday1){
-        this.workday1 = workday1;
-    }
-    /**
-     * 鑾峰彇 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday2(){
-        return workday2;
-    }
-    /**
-     * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2
-     */
-    public void setWorkday2(Integer workday2){
-        this.workday2 = workday2;
-    }
-    /**
-     * 鑾峰彇 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday3(){
-        return workday3;
-    }
-    /**
-     * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3
-     */
-    public void setWorkday3(Integer workday3){
-        this.workday3 = workday3;
-    }
-    /**
-     * 鑾峰彇 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday4(){
-        return workday4;
-    }
-    /**
-     * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4
-     */
-    public void setWorkday4(Integer workday4){
-        this.workday4 = workday4;
-    }
-    /**
-     * 鑾峰彇 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday5(){
-        return workday5;
-    }
-    /**
-     * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5
-     */
-    public void setWorkday5(Integer workday5){
-        this.workday5 = workday5;
-    }
-    /**
-     * 鑾峰彇 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday6(){
-        return workday6;
-    }
-    /**
-     * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6
-     */
-    public void setWorkday6(Integer workday6){
-        this.workday6 = workday6;
-    }
-    /**
-     * 鑾峰彇 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return Integer
-     */
-    public Integer getWorkday7(){
-        return workday7;
-    }
-    /**
-     * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7
-     */
-    public void setWorkday7(Integer workday7){
-        this.workday7 = workday7;
-    }
-    /**
-     * 鑾峰彇 妤煎眰
-     * @return Integer
-     */
-    public Integer getLevel(){
-        return level;
-    }
-    /**
-     * 璁剧疆 妤煎眰
-     * @param level
-     */
-    public void setLevel(Integer level){
-        this.level = level;
-    }
-    /**
-     * 鑾峰彇 妤兼爧
-     * @return Integer
-     */
-    public Integer getBuilding(){
-        return building;
-    }
-    /**
-     * 璁剧疆 妤兼爧
-     * @param building
-     */
-    public void setBuilding(Integer building){
-        this.building = building;
-    }
-    /**
-     * 鑾峰彇 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @return Integer
-     */
-    public Integer getIsSite(){
-        return isSite;
-    }
-    /**
-     * 璁剧疆 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSite
-     */
-    public void setIsSite(Integer isSite){
-        this.isSite = isSite;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @return Integer
-     */
-    public Integer getStatus(){
-        return status;
-    }
-    /**
-     * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param status
-     */
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-    /**
-     * 鑾峰彇 璁惧logo鍦板潃
-     * @return String
-     */
-    public String getLogoPath(){
-        return logoPath;
-    }
-    /**
-     * 璁剧疆 璁惧logo鍦板潃
-     * @param logoPath
-     */
-    public void setLogoPath(String logoPath){
-        this.logoPath = logoPath;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鑻辨枃鍚嶇О
-     * @return String
-     */
-    public String getEnglishName(){
-        return englishName;
-    }
-    /**
-     * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
-     * @param englishName
-     */
-    public void setEnglishName(String englishName){
-        this.englishName = englishName;
-    }
-    /**
-     * 鑾峰彇 璐熻矗浜�
-     * @return String
-     */
-    public String getLeadingOfficial(){
-        return leadingOfficial;
-    }
-    /**
-     * 璁剧疆 璐熻矗浜�
-     * @param leadingOfficial
-     */
-    public void setLeadingOfficial(String leadingOfficial){
-        this.leadingOfficial = leadingOfficial;
-    }
-    /**
-     * 鑾峰彇 鑱旂郴鐢佃瘽
-     * @return String
-     */
-    public String getLeadingOfficialTelephone(){
-        return leadingOfficialTelephone;
-    }
-    /**
-     * 璁剧疆 鑱旂郴鐢佃瘽
-     * @param leadingOfficialTelephone
-     */
-    public void setLeadingOfficialTelephone(String leadingOfficialTelephone){
-        this.leadingOfficialTelephone = leadingOfficialTelephone;
-    }
-    /**
-     * 鑾峰彇 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
-     * @return String
-     */
-    public String getModelIds(){
-        return modelIds;
-    }
-    /**
-     * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
-     * @param modelIds
-     */
-    public void setModelIds(String modelIds){
-        this.modelIds = modelIds;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-     * @return idStart
-     */
-    public Long getIdStart(){
-        return this.idStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-     * @param idStart
-     */
-    public void setIdStart(Long idStart){
-        this.idStart = idStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-     * @return $idEnd
-     */
-    public Long getIdEnd(){
-        return this.idEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-     * @param idEnd
-     */
-    public void setIdEnd(Long idEnd){
-        this.idEnd = idEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-     * @return idIncrement
-     */
-    public Long getIdIncrement(){
-        return this.idIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-     * @param idIncrement
-     */
-    public void setIdIncrement(Long idIncrement){
-        this.idIncrement = idIncrement;
-    }
-
-    /**
-     * 鑾峰彇 搴忓彿锛屼富閿紝鑷闀�
-     * @return idList
-     */
-    public List<Long> getIdList(){
-        return this.idList;
-    }
-
-    /**
-     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-     * @param idList
-     */
-    public void setIdList(List<Long> idList){
-        this.idList = idList;
-    }
-
-    /**
-     * 鑾峰彇 绔欑偣鍚嶇О
-     * @return siteNameList
-     */
-    public List<String> getSiteNameList(){
-        return this.siteNameList;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鍚嶇О
-     * @param siteNameList
-     */
-    public void setSiteNameList(List<String> siteNameList){
-        this.siteNameList = siteNameList;
-    }
-    /**
-     * 鑾峰彇 寮€濮� 鐖剁骇id,榛樿0
-     * @return parentIdStart
-     */
-    public Long getParentIdStart(){
-        return this.parentIdStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鐖剁骇id,榛樿0
-     * @param parentIdStart
-     */
-    public void setParentIdStart(Long parentIdStart){
-        this.parentIdStart = parentIdStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鐖剁骇id,榛樿0
-     * @return $parentIdEnd
-     */
-    public Long getParentIdEnd(){
-        return this.parentIdEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鐖剁骇id,榛樿0
-     * @param parentIdEnd
-     */
-    public void setParentIdEnd(Long parentIdEnd){
-        this.parentIdEnd = parentIdEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鐖剁骇id,榛樿0
-     * @return parentIdIncrement
-     */
-    public Long getParentIdIncrement(){
-        return this.parentIdIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鐖剁骇id,榛樿0
-     * @param parentIdIncrement
-     */
-    public void setParentIdIncrement(Long parentIdIncrement){
-        this.parentIdIncrement = parentIdIncrement;
-    }
-
-    /**
-     * 鑾峰彇 鐖剁骇id,榛樿0
-     * @return parentIdList
-     */
-    public List<Long> getParentIdList(){
-        return this.parentIdList;
-    }
-
-    /**
-     * 璁剧疆 鐖剁骇id,榛樿0
-     * @param parentIdList
-     */
-    public void setParentIdList(List<Long> parentIdList){
-        this.parentIdList = parentIdList;
-    }
-
-    /**
-     * 鑾峰彇 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-     * @return ancestorsList
-     */
-    public List<String> getAncestorsList(){
-        return this.ancestorsList;
-    }
-
-    /**
-     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-     * @param ancestorsList
-     */
-    public void setAncestorsList(List<String> ancestorsList){
-        this.ancestorsList = ancestorsList;
-    }
-    /**
-     * 鑾峰彇 鍖哄煙缂栧彿
-     * @return regionCodeList
-     */
-    public List<String> getRegionCodeList(){
-        return this.regionCodeList;
-    }
-
-    /**
-     * 璁剧疆 鍖哄煙缂栧彿
-     * @param regionCodeList
-     */
-    public void setRegionCodeList(List<String> regionCodeList){
-        this.regionCodeList = regionCodeList;
-    }
-    /**
-     * 鑾峰彇 鏍囪瘑ID
-     * @return iidList
-     */
-    public List<String> getIidList(){
-        return this.iidList;
-    }
-
-    /**
-     * 璁剧疆 鏍囪瘑ID
-     * @param iidList
-     */
-    public void setIidList(List<String> iidList){
-        this.iidList = iidList;
-    }
-    /**
-     * 鑾峰彇 绔欑偣缂栧彿
-     * @return siteCodeList
-     */
-    public List<String> getSiteCodeList(){
-        return this.siteCodeList;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣缂栧彿
-     * @param siteCodeList
-     */
-    public void setSiteCodeList(List<String> siteCodeList){
-        this.siteCodeList = siteCodeList;
-    }
-    /**
-     * 鑾峰彇 鐪佺紪鐮�
-     * @return proCodeList
-     */
-    public List<String> getProCodeList(){
-        return this.proCodeList;
-    }
-
-    /**
-     * 璁剧疆 鐪佺紪鐮�
-     * @param proCodeList
-     */
-    public void setProCodeList(List<String> proCodeList){
-        this.proCodeList = proCodeList;
-    }
-    /**
-     * 鑾峰彇 鍖哄煙ID
-     * @return areaIDList
-     */
-    public List<String> getAreaIDList(){
-        return this.areaIDList;
-    }
-
-    /**
-     * 璁剧疆 鍖哄煙ID
-     * @param areaIDList
-     */
-    public void setAreaIDList(List<String> areaIDList){
-        this.areaIDList = areaIDList;
-    }
-    /**
-     * 鑾峰彇 鍖哄煙缂栫爜
-     * @return areaCodeList
-     */
-    public List<String> getAreaCodeList(){
-        return this.areaCodeList;
-    }
-
-    /**
-     * 璁剧疆 鍖哄煙缂栫爜
-     * @param areaCodeList
-     */
-    public void setAreaCodeList(List<String> areaCodeList){
-        this.areaCodeList = areaCodeList;
-    }
-    /**
-     * 鑾峰彇 甯傜紪鐮�
-     * @return cityCodeList
-     */
-    public List<String> getCityCodeList(){
-        return this.cityCodeList;
-    }
-
-    /**
-     * 璁剧疆 甯傜紪鐮�
-     * @param cityCodeList
-     */
-    public void setCityCodeList(List<String> cityCodeList){
-        this.cityCodeList = cityCodeList;
-    }
-    /**
-     * 鑾峰彇 鍖虹紪鐮�
-     * @return districtCodeList
-     */
-    public List<String> getDistrictCodeList(){
-        return this.districtCodeList;
-    }
-
-    /**
-     * 璁剧疆 鍖虹紪鐮�
-     * @param districtCodeList
-     */
-    public void setDistrictCodeList(List<String> districtCodeList){
-        this.districtCodeList = districtCodeList;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鏈嶅姟鍣╥p
-     * @return siteIpList
-     */
-    public List<String> getSiteIpList(){
-        return this.siteIpList;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
-     * @param siteIpList
-     */
-    public void setSiteIpList(List<String> siteIpList){
-        this.siteIpList = siteIpList;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鏈嶅姟鍣ㄧ鍙�
-     * @return sitePortList
-     */
-    public List<String> getSitePortList(){
-        return this.sitePortList;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
-     * @param sitePortList
-     */
-    public void setSitePortList(List<String> sitePortList){
-        this.sitePortList = sitePortList;
-    }
-    /**
-     * 鑾峰彇 缁忓害
-     * @return longitudeList
-     */
-    public List<String> getLongitudeList(){
-        return this.longitudeList;
-    }
-
-    /**
-     * 璁剧疆 缁忓害
-     * @param longitudeList
-     */
-    public void setLongitudeList(List<String> longitudeList){
-        this.longitudeList = longitudeList;
-    }
-    /**
-     * 鑾峰彇 绾害
-     * @return latitudeList
-     */
-    public List<String> getLatitudeList(){
-        return this.latitudeList;
-    }
-
-    /**
-     * 璁剧疆 绾害
-     * @param latitudeList
-     */
-    public void setLatitudeList(List<String> latitudeList){
-        this.latitudeList = latitudeList;
-    }
-    /**
-     * 鑾峰彇 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     * @return haveSonAreaList
-     */
-    public List<String> getHaveSonAreaList(){
-        return this.haveSonAreaList;
-    }
-
-    /**
-     * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     * @param haveSonAreaList
-     */
-    public void setHaveSonAreaList(List<String> haveSonAreaList){
-        this.haveSonAreaList = haveSonAreaList;
-    }
-    /**
-     * 鑾峰彇 涓績鑱旂郴鐢佃瘽
-     * @return siteTelList
-     */
-    public List<String> getSiteTelList(){
-        return this.siteTelList;
-    }
-
-    /**
-     * 璁剧疆 涓績鑱旂郴鐢佃瘽
-     * @param siteTelList
-     */
-    public void setSiteTelList(List<String> siteTelList){
-        this.siteTelList = siteTelList;
-    }
-    /**
-     * 鑾峰彇 涓績璇︾粏鍦板潃
-     * @return detailAddressList
-     */
-    public List<String> getDetailAddressList(){
-        return this.detailAddressList;
-    }
-
-    /**
-     * 璁剧疆 涓績璇︾粏鍦板潃
-     * @param detailAddressList
-     */
-    public void setDetailAddressList(List<String> detailAddressList){
-        this.detailAddressList = detailAddressList;
-    }
-    /**
-     * 鑾峰彇 涓績浠嬬粛
-     * @return siteRemarkList
-     */
-    public List<String> getSiteRemarkList(){
-        return this.siteRemarkList;
-    }
-
-    /**
-     * 璁剧疆 涓績浠嬬粛
-     * @param siteRemarkList
-     */
-    public void setSiteRemarkList(List<String> siteRemarkList){
-        this.siteRemarkList = siteRemarkList;
-    }
-    /**
-     * 鑾峰彇 涓婂崍涓婄彮寮€濮嬫椂闂�
-     * @return amWorkStartTimeList
-     */
-    public List<String> getAmWorkStartTimeList(){
-        return this.amWorkStartTimeList;
-    }
-
-    /**
-     * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
-     * @param amWorkStartTimeList
-     */
-    public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){
-        this.amWorkStartTimeList = amWorkStartTimeList;
-    }
-    /**
-     * 鑾峰彇 涓婂崍涓婄彮缁撴潫鏃堕棿
-     * @return amWorkEndTimeList
-     */
-    public List<String> getAmWorkEndTimeList(){
-        return this.amWorkEndTimeList;
-    }
-
-    /**
-     * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
-     * @param amWorkEndTimeList
-     */
-    public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){
-        this.amWorkEndTimeList = amWorkEndTimeList;
-    }
-    /**
-     * 鑾峰彇 涓嬪崍涓婄彮寮€濮嬫椂闂�
-     * @return pmWorkStartTimeList
-     */
-    public List<String> getPmWorkStartTimeList(){
-        return this.pmWorkStartTimeList;
-    }
-
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
-     * @param pmWorkStartTimeList
-     */
-    public void setPmWorkStartTimeList(List<String> pmWorkStartTimeList){
-        this.pmWorkStartTimeList = pmWorkStartTimeList;
-    }
-    /**
-     * 鑾峰彇 涓嬪崍涓婄彮缁撴潫鏃堕棿
-     * @return pmWorkEndTimeList
-     */
-    public List<String> getPmWorkEndTimeList(){
-        return this.pmWorkEndTimeList;
-    }
-
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
-     * @param pmWorkEndTimeList
-     */
-    public void setPmWorkEndTimeList(List<String> pmWorkEndTimeList){
-        this.pmWorkEndTimeList = pmWorkEndTimeList;
-    }
-    /**
-     * 鑾峰彇 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @return averageTimeStart
-     */
-    public Integer getAverageTimeStart(){
-        return this.averageTimeStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeStart
-     */
-    public void setAverageTimeStart(Integer averageTimeStart){
-        this.averageTimeStart = averageTimeStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @return $averageTimeEnd
-     */
-    public Integer getAverageTimeEnd(){
-        return this.averageTimeEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeEnd
-     */
-    public void setAverageTimeEnd(Integer averageTimeEnd){
-        this.averageTimeEnd = averageTimeEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @return averageTimeIncrement
-     */
-    public Integer getAverageTimeIncrement(){
-        return this.averageTimeIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeIncrement
-     */
-    public void setAverageTimeIncrement(Integer averageTimeIncrement){
-        this.averageTimeIncrement = averageTimeIncrement;
-    }
-
-    /**
-     * 鑾峰彇 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @return averageTimeList
-     */
-    public List<Integer> getAverageTimeList(){
-        return this.averageTimeList;
-    }
-
-    /**
-     * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeList
-     */
-    public void setAverageTimeList(List<Integer> averageTimeList){
-        this.averageTimeList = averageTimeList;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @return waitingNumberStart
-     */
-    public Integer getWaitingNumberStart(){
-        return this.waitingNumberStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberStart
-     */
-    public void setWaitingNumberStart(Integer waitingNumberStart){
-        this.waitingNumberStart = waitingNumberStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @return $waitingNumberEnd
-     */
-    public Integer getWaitingNumberEnd(){
-        return this.waitingNumberEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberEnd
-     */
-    public void setWaitingNumberEnd(Integer waitingNumberEnd){
-        this.waitingNumberEnd = waitingNumberEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @return waitingNumberIncrement
-     */
-    public Integer getWaitingNumberIncrement(){
-        return this.waitingNumberIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberIncrement
-     */
-    public void setWaitingNumberIncrement(Integer waitingNumberIncrement){
-        this.waitingNumberIncrement = waitingNumberIncrement;
-    }
-
-    /**
-     * 鑾峰彇 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @return waitingNumberList
-     */
-    public List<Integer> getWaitingNumberList(){
-        return this.waitingNumberList;
-    }
-
-    /**
-     * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberList
-     */
-    public void setWaitingNumberList(List<Integer> waitingNumberList){
-        this.waitingNumberList = waitingNumberList;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday1Start
-     */
-    public Integer getWorkday1Start(){
-        return this.workday1Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1Start
-     */
-    public void setWorkday1Start(Integer workday1Start){
-        this.workday1Start = workday1Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday1End
-     */
-    public Integer getWorkday1End(){
-        return this.workday1End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1End
-     */
-    public void setWorkday1End(Integer workday1End){
-        this.workday1End = workday1End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday1Increment
-     */
-    public Integer getWorkday1Increment(){
-        return this.workday1Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1Increment
-     */
-    public void setWorkday1Increment(Integer workday1Increment){
-        this.workday1Increment = workday1Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday1List
-     */
-    public List<Integer> getWorkday1List(){
-        return this.workday1List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1List
-     */
-    public void setWorkday1List(List<Integer> workday1List){
-        this.workday1List = workday1List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday2Start
-     */
-    public Integer getWorkday2Start(){
-        return this.workday2Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2Start
-     */
-    public void setWorkday2Start(Integer workday2Start){
-        this.workday2Start = workday2Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday2End
-     */
-    public Integer getWorkday2End(){
-        return this.workday2End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2End
-     */
-    public void setWorkday2End(Integer workday2End){
-        this.workday2End = workday2End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday2Increment
-     */
-    public Integer getWorkday2Increment(){
-        return this.workday2Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2Increment
-     */
-    public void setWorkday2Increment(Integer workday2Increment){
-        this.workday2Increment = workday2Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday2List
-     */
-    public List<Integer> getWorkday2List(){
-        return this.workday2List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2List
-     */
-    public void setWorkday2List(List<Integer> workday2List){
-        this.workday2List = workday2List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday3Start
-     */
-    public Integer getWorkday3Start(){
-        return this.workday3Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3Start
-     */
-    public void setWorkday3Start(Integer workday3Start){
-        this.workday3Start = workday3Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday3End
-     */
-    public Integer getWorkday3End(){
-        return this.workday3End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3End
-     */
-    public void setWorkday3End(Integer workday3End){
-        this.workday3End = workday3End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday3Increment
-     */
-    public Integer getWorkday3Increment(){
-        return this.workday3Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3Increment
-     */
-    public void setWorkday3Increment(Integer workday3Increment){
-        this.workday3Increment = workday3Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday3List
-     */
-    public List<Integer> getWorkday3List(){
-        return this.workday3List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3List
-     */
-    public void setWorkday3List(List<Integer> workday3List){
-        this.workday3List = workday3List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday4Start
-     */
-    public Integer getWorkday4Start(){
-        return this.workday4Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4Start
-     */
-    public void setWorkday4Start(Integer workday4Start){
-        this.workday4Start = workday4Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday4End
-     */
-    public Integer getWorkday4End(){
-        return this.workday4End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4End
-     */
-    public void setWorkday4End(Integer workday4End){
-        this.workday4End = workday4End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday4Increment
-     */
-    public Integer getWorkday4Increment(){
-        return this.workday4Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4Increment
-     */
-    public void setWorkday4Increment(Integer workday4Increment){
-        this.workday4Increment = workday4Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday4List
-     */
-    public List<Integer> getWorkday4List(){
-        return this.workday4List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4List
-     */
-    public void setWorkday4List(List<Integer> workday4List){
-        this.workday4List = workday4List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday5Start
-     */
-    public Integer getWorkday5Start(){
-        return this.workday5Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5Start
-     */
-    public void setWorkday5Start(Integer workday5Start){
-        this.workday5Start = workday5Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday5End
-     */
-    public Integer getWorkday5End(){
-        return this.workday5End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5End
-     */
-    public void setWorkday5End(Integer workday5End){
-        this.workday5End = workday5End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday5Increment
-     */
-    public Integer getWorkday5Increment(){
-        return this.workday5Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5Increment
-     */
-    public void setWorkday5Increment(Integer workday5Increment){
-        this.workday5Increment = workday5Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday5List
-     */
-    public List<Integer> getWorkday5List(){
-        return this.workday5List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5List
-     */
-    public void setWorkday5List(List<Integer> workday5List){
-        this.workday5List = workday5List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday6Start
-     */
-    public Integer getWorkday6Start(){
-        return this.workday6Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6Start
-     */
-    public void setWorkday6Start(Integer workday6Start){
-        this.workday6Start = workday6Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday6End
-     */
-    public Integer getWorkday6End(){
-        return this.workday6End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6End
-     */
-    public void setWorkday6End(Integer workday6End){
-        this.workday6End = workday6End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday6Increment
-     */
-    public Integer getWorkday6Increment(){
-        return this.workday6Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6Increment
-     */
-    public void setWorkday6Increment(Integer workday6Increment){
-        this.workday6Increment = workday6Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday6List
-     */
-    public List<Integer> getWorkday6List(){
-        return this.workday6List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6List
-     */
-    public void setWorkday6List(List<Integer> workday6List){
-        this.workday6List = workday6List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday7Start
-     */
-    public Integer getWorkday7Start(){
-        return this.workday7Start;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7Start
-     */
-    public void setWorkday7Start(Integer workday7Start){
-        this.workday7Start = workday7Start;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return $workday7End
-     */
-    public Integer getWorkday7End(){
-        return this.workday7End;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7End
-     */
-    public void setWorkday7End(Integer workday7End){
-        this.workday7End = workday7End;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday7Increment
-     */
-    public Integer getWorkday7Increment(){
-        return this.workday7Increment;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7Increment
-     */
-    public void setWorkday7Increment(Integer workday7Increment){
-        this.workday7Increment = workday7Increment;
-    }
-
-    /**
-     * 鑾峰彇 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @return workday7List
-     */
-    public List<Integer> getWorkday7List(){
-        return this.workday7List;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7List
-     */
-    public void setWorkday7List(List<Integer> workday7List){
-        this.workday7List = workday7List;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 妤煎眰
-     * @return levelStart
-     */
-    public Integer getLevelStart(){
-        return this.levelStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 妤煎眰
-     * @param levelStart
-     */
-    public void setLevelStart(Integer levelStart){
-        this.levelStart = levelStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 妤煎眰
-     * @return $levelEnd
-     */
-    public Integer getLevelEnd(){
-        return this.levelEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 妤煎眰
-     * @param levelEnd
-     */
-    public void setLevelEnd(Integer levelEnd){
-        this.levelEnd = levelEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 妤煎眰
-     * @return levelIncrement
-     */
-    public Integer getLevelIncrement(){
-        return this.levelIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 妤煎眰
-     * @param levelIncrement
-     */
-    public void setLevelIncrement(Integer levelIncrement){
-        this.levelIncrement = levelIncrement;
-    }
-
-    /**
-     * 鑾峰彇 妤煎眰
-     * @return levelList
-     */
-    public List<Integer> getLevelList(){
-        return this.levelList;
-    }
-
-    /**
-     * 璁剧疆 妤煎眰
-     * @param levelList
-     */
-    public void setLevelList(List<Integer> levelList){
-        this.levelList = levelList;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 妤兼爧
-     * @return buildingStart
-     */
-    public Integer getBuildingStart(){
-        return this.buildingStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 妤兼爧
-     * @param buildingStart
-     */
-    public void setBuildingStart(Integer buildingStart){
-        this.buildingStart = buildingStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 妤兼爧
-     * @return $buildingEnd
-     */
-    public Integer getBuildingEnd(){
-        return this.buildingEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 妤兼爧
-     * @param buildingEnd
-     */
-    public void setBuildingEnd(Integer buildingEnd){
-        this.buildingEnd = buildingEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 妤兼爧
-     * @return buildingIncrement
-     */
-    public Integer getBuildingIncrement(){
-        return this.buildingIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 妤兼爧
-     * @param buildingIncrement
-     */
-    public void setBuildingIncrement(Integer buildingIncrement){
-        this.buildingIncrement = buildingIncrement;
-    }
-
-    /**
-     * 鑾峰彇 妤兼爧
-     * @return buildingList
-     */
-    public List<Integer> getBuildingList(){
-        return this.buildingList;
-    }
-
-    /**
-     * 璁剧疆 妤兼爧
-     * @param buildingList
-     */
-    public void setBuildingList(List<Integer> buildingList){
-        this.buildingList = buildingList;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @return isSiteStart
-     */
-    public Integer getIsSiteStart(){
-        return this.isSiteStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteStart
-     */
-    public void setIsSiteStart(Integer isSiteStart){
-        this.isSiteStart = isSiteStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @return $isSiteEnd
-     */
-    public Integer getIsSiteEnd(){
-        return this.isSiteEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteEnd
-     */
-    public void setIsSiteEnd(Integer isSiteEnd){
-        this.isSiteEnd = isSiteEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @return isSiteIncrement
-     */
-    public Integer getIsSiteIncrement(){
-        return this.isSiteIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteIncrement
-     */
-    public void setIsSiteIncrement(Integer isSiteIncrement){
-        this.isSiteIncrement = isSiteIncrement;
-    }
-
-    /**
-     * 鑾峰彇 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @return isSiteList
-     */
-    public List<Integer> getIsSiteList(){
-        return this.isSiteList;
-    }
-
-    /**
-     * 璁剧疆 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteList
-     */
-    public void setIsSiteList(List<Integer> isSiteList){
-        this.isSiteList = isSiteList;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @return statusStart
-     */
-    public Integer getStatusStart(){
-        return this.statusStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusStart
-     */
-    public void setStatusStart(Integer statusStart){
-        this.statusStart = statusStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @return $statusEnd
-     */
-    public Integer getStatusEnd(){
-        return this.statusEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusEnd
-     */
-    public void setStatusEnd(Integer statusEnd){
-        this.statusEnd = statusEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @return statusIncrement
-     */
-    public Integer getStatusIncrement(){
-        return this.statusIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusIncrement
-     */
-    public void setStatusIncrement(Integer statusIncrement){
-        this.statusIncrement = statusIncrement;
-    }
-
-    /**
-     * 鑾峰彇 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @return statusList
-     */
-    public List<Integer> getStatusList(){
-        return this.statusList;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusList
-     */
-    public void setStatusList(List<Integer> statusList){
-        this.statusList = statusList;
-    }
-
-    /**
-     * 鑾峰彇 璁惧logo鍦板潃
-     * @return logoPathList
-     */
-    public List<String> getLogoPathList(){
-        return this.logoPathList;
-    }
-
-    /**
-     * 璁剧疆 璁惧logo鍦板潃
-     * @param logoPathList
-     */
-    public void setLogoPathList(List<String> logoPathList){
-        this.logoPathList = logoPathList;
-    }
-    /**
-     * 鑾峰彇 绔欑偣鑻辨枃鍚嶇О
-     * @return englishNameList
-     */
-    public List<String> getEnglishNameList(){
-        return this.englishNameList;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
-     * @param englishNameList
-     */
-    public void setEnglishNameList(List<String> englishNameList){
-        this.englishNameList = englishNameList;
-    }
-    /**
-     * 鑾峰彇 璐熻矗浜�
-     * @return leadingOfficialList
-     */
-    public List<String> getLeadingOfficialList(){
-        return this.leadingOfficialList;
-    }
-
-    /**
-     * 璁剧疆 璐熻矗浜�
-     * @param leadingOfficialList
-     */
-    public void setLeadingOfficialList(List<String> leadingOfficialList){
-        this.leadingOfficialList = leadingOfficialList;
-    }
-    /**
-     * 鑾峰彇 鑱旂郴鐢佃瘽
-     * @return leadingOfficialTelephoneList
-     */
-    public List<String> getLeadingOfficialTelephoneList(){
-        return this.leadingOfficialTelephoneList;
-    }
-
-    /**
-     * 璁剧疆 鑱旂郴鐢佃瘽
-     * @param leadingOfficialTelephoneList
-     */
-    public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
-        this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
-    }
-    /**
-     * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-     * @return createTimeStart
-     */
-    public String getCreateTimeStart(){
-        return this.createTimeStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-     * @param createTimeStart
-     */
-    public void setCreateTimeStart(String createTimeStart){
-        this.createTimeStart = createTimeStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-     * @return createTimeEnd
-     */
-    public String getCreateTimeEnd(){
-        return this.createTimeEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-     * @param createTimeEnd
-     */
-    public void setCreateTimeEnd(String createTimeEnd){
-        this.createTimeEnd = createTimeEnd;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-     * @return createUserIdStart
-     */
-    public Long getCreateUserIdStart(){
-        return this.createUserIdStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-     * @param createUserIdStart
-     */
-    public void setCreateUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-     * @return $createUserIdEnd
-     */
-    public Long getCreateUserIdEnd(){
-        return this.createUserIdEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-     * @param createUserIdEnd
-     */
-    public void setCreateUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-    }
-
-    /**
-     * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-     * @return createUserIdIncrement
-     */
-    public Long getCreateUserIdIncrement(){
-        return this.createUserIdIncrement;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-     * @param createUserIdIncrement
-     */
-    public void setCreateUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-    }
-
-    /**
-     * 鑾峰彇 鍒涘缓鐢ㄦ埛
-     * @return createUserIdList
-     */
-    public List<Long> getCreateUserIdList(){
-        return this.createUserIdList;
-    }
-
-    /**
-     * 璁剧疆 鍒涘缓鐢ㄦ埛
-     * @param createUserIdList
-     */
-    public void setCreateUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-    }
-
-    /**
-     * 鑾峰彇 寮€濮� 淇敼鏃堕棿
-     * @return updateTimeStart
-     */
-    public String getUpdateTimeStart(){
-        return this.updateTimeStart;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 淇敼鏃堕棿
-     * @param updateTimeStart
-     */
-    public void setUpdateTimeStart(String updateTimeStart){
-        this.updateTimeStart = updateTimeStart;
-    }
-
-    /**
-     * 鑾峰彇 缁撴潫 淇敼鏃堕棿
-     * @return updateTimeEnd
-     */
-    public String getUpdateTimeEnd(){
-        return this.updateTimeEnd;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 淇敼鏃堕棿
-     * @param updateTimeEnd
-     */
-    public void setUpdateTimeEnd(String updateTimeEnd){
-        this.updateTimeEnd = updateTimeEnd;
-    }
-
-    /**
-     * 鑾峰彇 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
-     * @return modelIdsList
-     */
-    public List<String> getModelIdsList(){
-        return this.modelIdsList;
-    }
-
-    /**
-     * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
-     * @param modelIdsList
-     */
-    public void setModelIdsList(List<String> modelIdsList){
-        this.modelIdsList = modelIdsList;
-    }
-    /**
-     * 璁剧疆  搴忓彿锛屼富閿紝鑷闀�
-     * @param id
-     */
-    public SitePdu id(Long id){
-        setId(id);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 搴忓彿锛屼富閿紝鑷闀�
-     * @param idStart
-     */
-    public SitePdu idStart(Long idStart){
-        this.idStart = idStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 搴忓彿锛屼富閿紝鑷闀�
-     * @param idEnd
-     */
-    public SitePdu idEnd(Long idEnd){
-        this.idEnd = idEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 搴忓彿锛屼富閿紝鑷闀�
-     * @param idIncrement
-     */
-    public SitePdu idIncrement(Long idIncrement){
-        this.idIncrement = idIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
-     * @param idList
-     */
-    public SitePdu idList(List<Long> idList){
-        this.idList = idList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绔欑偣鍚嶇О
-     * @param siteName
-     */
-    public SitePdu siteName(String siteName){
-        setSiteName(siteName);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鍚嶇О
-     * @param siteNameList
-     */
-    public SitePdu siteNameList(List<String> siteNameList){
-        this.siteNameList = siteNameList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鐖剁骇id,榛樿0
-     * @param parentId
-     */
-    public SitePdu parentId(Long parentId){
-        setParentId(parentId);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鐖剁骇id,榛樿0
-     * @param parentIdStart
-     */
-    public SitePdu parentIdStart(Long parentIdStart){
-        this.parentIdStart = parentIdStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鐖剁骇id,榛樿0
-     * @param parentIdEnd
-     */
-    public SitePdu parentIdEnd(Long parentIdEnd){
-        this.parentIdEnd = parentIdEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鐖剁骇id,榛樿0
-     * @param parentIdIncrement
-     */
-    public SitePdu parentIdIncrement(Long parentIdIncrement){
-        this.parentIdIncrement = parentIdIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鐖剁骇id,榛樿0
-     * @param parentIdList
-     */
-    public SitePdu parentIdList(List<Long> parentIdList){
-        this.parentIdList = parentIdList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-     * @param ancestors
-     */
-    public SitePdu ancestors(String ancestors){
-        setAncestors(ancestors);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧
-     * @param ancestorsList
-     */
-    public SitePdu ancestorsList(List<String> ancestorsList){
-        this.ancestorsList = ancestorsList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鍖哄煙缂栧彿
-     * @param regionCode
-     */
-    public SitePdu regionCode(String regionCode){
-        setRegionCode(regionCode);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍖哄煙缂栧彿
-     * @param regionCodeList
-     */
-    public SitePdu regionCodeList(List<String> regionCodeList){
-        this.regionCodeList = regionCodeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鏍囪瘑ID
-     * @param iid
-     */
-    public SitePdu iid(String iid){
-        setIid(iid);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鏍囪瘑ID
-     * @param iidList
-     */
-    public SitePdu iidList(List<String> iidList){
-        this.iidList = iidList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绔欑偣缂栧彿
-     * @param siteCode
-     */
-    public SitePdu siteCode(String siteCode){
-        setSiteCode(siteCode);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣缂栧彿
-     * @param siteCodeList
-     */
-    public SitePdu siteCodeList(List<String> siteCodeList){
-        this.siteCodeList = siteCodeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鐪佺紪鐮�
-     * @param proCode
-     */
-    public SitePdu proCode(String proCode){
-        setProCode(proCode);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鐪佺紪鐮�
-     * @param proCodeList
-     */
-    public SitePdu proCodeList(List<String> proCodeList){
-        this.proCodeList = proCodeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鍖哄煙ID
-     * @param areaID
-     */
-    public SitePdu areaID(String areaID){
-        setAreaID(areaID);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍖哄煙ID
-     * @param areaIDList
-     */
-    public SitePdu areaIDList(List<String> areaIDList){
-        this.areaIDList = areaIDList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鍖哄煙缂栫爜
-     * @param areaCode
-     */
-    public SitePdu areaCode(String areaCode){
-        setAreaCode(areaCode);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍖哄煙缂栫爜
-     * @param areaCodeList
-     */
-    public SitePdu areaCodeList(List<String> areaCodeList){
-        this.areaCodeList = areaCodeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 甯傜紪鐮�
-     * @param cityCode
-     */
-    public SitePdu cityCode(String cityCode){
-        setCityCode(cityCode);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 甯傜紪鐮�
-     * @param cityCodeList
-     */
-    public SitePdu cityCodeList(List<String> cityCodeList){
-        this.cityCodeList = cityCodeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鍖虹紪鐮�
-     * @param districtCode
-     */
-    public SitePdu districtCode(String districtCode){
-        setDistrictCode(districtCode);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍖虹紪鐮�
-     * @param districtCodeList
-     */
-    public SitePdu districtCodeList(List<String> districtCodeList){
-        this.districtCodeList = districtCodeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
-     * @param siteIp
-     */
-    public SitePdu siteIp(String siteIp){
-        setSiteIp(siteIp);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣╥p
-     * @param siteIpList
-     */
-    public SitePdu siteIpList(List<String> siteIpList){
-        this.siteIpList = siteIpList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
-     * @param sitePort
-     */
-    public SitePdu sitePort(String sitePort){
-        setSitePort(sitePort);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鏈嶅姟鍣ㄧ鍙�
-     * @param sitePortList
-     */
-    public SitePdu sitePortList(List<String> sitePortList){
-        this.sitePortList = sitePortList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 缁忓害
-     * @param longitude
-     */
-    public SitePdu longitude(String longitude){
-        setLongitude(longitude);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁忓害
-     * @param longitudeList
-     */
-    public SitePdu longitudeList(List<String> longitudeList){
-        this.longitudeList = longitudeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绾害
-     * @param latitude
-     */
-    public SitePdu latitude(String latitude){
-        setLatitude(latitude);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绾害
-     * @param latitudeList
-     */
-    public SitePdu latitudeList(List<String> latitudeList){
-        this.latitudeList = latitudeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     * @param haveSonArea
-     */
-    public SitePdu haveSonArea(String haveSonArea){
-        setHaveSonArea(haveSonArea);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鏄惁鏈変笅绾�(0.鍚︼紝1.鏄�)
-     * @param haveSonAreaList
-     */
-    public SitePdu haveSonAreaList(List<String> haveSonAreaList){
-        this.haveSonAreaList = haveSonAreaList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓績鑱旂郴鐢佃瘽
-     * @param siteTel
-     */
-    public SitePdu siteTel(String siteTel){
-        setSiteTel(siteTel);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓績鑱旂郴鐢佃瘽
-     * @param siteTelList
-     */
-    public SitePdu siteTelList(List<String> siteTelList){
-        this.siteTelList = siteTelList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓績璇︾粏鍦板潃
-     * @param detailAddress
-     */
-    public SitePdu detailAddress(String detailAddress){
-        setDetailAddress(detailAddress);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓績璇︾粏鍦板潃
-     * @param detailAddressList
-     */
-    public SitePdu detailAddressList(List<String> detailAddressList){
-        this.detailAddressList = detailAddressList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓績浠嬬粛
-     * @param siteRemark
-     */
-    public SitePdu siteRemark(String siteRemark){
-        setSiteRemark(siteRemark);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓績浠嬬粛
-     * @param siteRemarkList
-     */
-    public SitePdu siteRemarkList(List<String> siteRemarkList){
-        this.siteRemarkList = siteRemarkList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
-     * @param amWorkStartTime
-     */
-    public SitePdu amWorkStartTime(String amWorkStartTime){
-        setAmWorkStartTime(amWorkStartTime);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓婂崍涓婄彮寮€濮嬫椂闂�
-     * @param amWorkStartTimeList
-     */
-    public SitePdu amWorkStartTimeList(List<String> amWorkStartTimeList){
-        this.amWorkStartTimeList = amWorkStartTimeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
-     * @param amWorkEndTime
-     */
-    public SitePdu amWorkEndTime(String amWorkEndTime){
-        setAmWorkEndTime(amWorkEndTime);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓婂崍涓婄彮缁撴潫鏃堕棿
-     * @param amWorkEndTimeList
-     */
-    public SitePdu amWorkEndTimeList(List<String> amWorkEndTimeList){
-        this.amWorkEndTimeList = amWorkEndTimeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
-     * @param pmWorkStartTime
-     */
-    public SitePdu pmWorkStartTime(String pmWorkStartTime){
-        setPmWorkStartTime(pmWorkStartTime);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮寮€濮嬫椂闂�
-     * @param pmWorkStartTimeList
-     */
-    public SitePdu pmWorkStartTimeList(List<String> pmWorkStartTimeList){
-        this.pmWorkStartTimeList = pmWorkStartTimeList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
-     * @param pmWorkEndTime
-     */
-    public SitePdu pmWorkEndTime(String pmWorkEndTime){
-        setPmWorkEndTime(pmWorkEndTime);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 涓嬪崍涓婄彮缁撴潫鏃堕棿
-     * @param pmWorkEndTimeList
-     */
-    public SitePdu pmWorkEndTimeList(List<String> pmWorkEndTimeList){
-        this.pmWorkEndTimeList = pmWorkEndTimeList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTime
-     */
-    public SitePdu averageTime(Integer averageTime){
-        setAverageTime(averageTime);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeStart
-     */
-    public SitePdu averageTimeStart(Integer averageTimeStart){
-        this.averageTimeStart = averageTimeStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeEnd
-     */
-    public SitePdu averageTimeEnd(Integer averageTimeEnd){
-        this.averageTimeEnd = averageTimeEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeIncrement
-     */
-    public SitePdu averageTimeIncrement(Integer averageTimeIncrement){
-        this.averageTimeIncrement = averageTimeIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 骞冲潎绛夊緟鏃堕棿,鍚庢湡鍒犻櫎
-     * @param averageTimeList
-     */
-    public SitePdu averageTimeList(List<Integer> averageTimeList){
-        this.averageTimeList = averageTimeList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumber
-     */
-    public SitePdu waitingNumber(Integer waitingNumber){
-        setWaitingNumber(waitingNumber);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberStart
-     */
-    public SitePdu waitingNumberStart(Integer waitingNumberStart){
-        this.waitingNumberStart = waitingNumberStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberEnd
-     */
-    public SitePdu waitingNumberEnd(Integer waitingNumberEnd){
-        this.waitingNumberEnd = waitingNumberEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberIncrement
-     */
-    public SitePdu waitingNumberIncrement(Integer waitingNumberIncrement){
-        this.waitingNumberIncrement = waitingNumberIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绛夊緟浜烘暟,鍚庢湡鍒犻櫎
-     * @param waitingNumberList
-     */
-    public SitePdu waitingNumberList(List<Integer> waitingNumberList){
-        this.waitingNumberList = waitingNumberList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1
-     */
-    public SitePdu workday1(Integer workday1){
-        setWorkday1(workday1);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1Start
-     */
-    public SitePdu workday1Start(Integer workday1Start){
-        this.workday1Start = workday1Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1End
-     */
-    public SitePdu workday1End(Integer workday1End){
-        this.workday1End = workday1End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1Increment
-     */
-    public SitePdu workday1Increment(Integer workday1Increment){
-        this.workday1Increment = workday1Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ竴 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday1List
-     */
-    public SitePdu workday1List(List<Integer> workday1List){
-        this.workday1List = workday1List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2
-     */
-    public SitePdu workday2(Integer workday2){
-        setWorkday2(workday2);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2Start
-     */
-    public SitePdu workday2Start(Integer workday2Start){
-        this.workday2Start = workday2Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2End
-     */
-    public SitePdu workday2End(Integer workday2End){
-        this.workday2End = workday2End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2Increment
-     */
-    public SitePdu workday2Increment(Integer workday2Increment){
-        this.workday2Increment = workday2Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ簩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday2List
-     */
-    public SitePdu workday2List(List<Integer> workday2List){
-        this.workday2List = workday2List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3
-     */
-    public SitePdu workday3(Integer workday3){
-        setWorkday3(workday3);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3Start
-     */
-    public SitePdu workday3Start(Integer workday3Start){
-        this.workday3Start = workday3Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3End
-     */
-    public SitePdu workday3End(Integer workday3End){
-        this.workday3End = workday3End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3Increment
-     */
-    public SitePdu workday3Increment(Integer workday3Increment){
-        this.workday3Increment = workday3Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ笁 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday3List
-     */
-    public SitePdu workday3List(List<Integer> workday3List){
-        this.workday3List = workday3List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4
-     */
-    public SitePdu workday4(Integer workday4){
-        setWorkday4(workday4);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4Start
-     */
-    public SitePdu workday4Start(Integer workday4Start){
-        this.workday4Start = workday4Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4End
-     */
-    public SitePdu workday4End(Integer workday4End){
-        this.workday4End = workday4End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4Increment
-     */
-    public SitePdu workday4Increment(Integer workday4Increment){
-        this.workday4Increment = workday4Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄥ洓 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday4List
-     */
-    public SitePdu workday4List(List<Integer> workday4List){
-        this.workday4List = workday4List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5
-     */
-    public SitePdu workday5(Integer workday5){
-        setWorkday5(workday5);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5Start
-     */
-    public SitePdu workday5Start(Integer workday5Start){
-        this.workday5Start = workday5Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5End
-     */
-    public SitePdu workday5End(Integer workday5End){
-        this.workday5End = workday5End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5Increment
-     */
-    public SitePdu workday5Increment(Integer workday5Increment){
-        this.workday5Increment = workday5Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄤ簲 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday5List
-     */
-    public SitePdu workday5List(List<Integer> workday5List){
-        this.workday5List = workday5List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6
-     */
-    public SitePdu workday6(Integer workday6){
-        setWorkday6(workday6);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6Start
-     */
-    public SitePdu workday6Start(Integer workday6Start){
-        this.workday6Start = workday6Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6End
-     */
-    public SitePdu workday6End(Integer workday6End){
-        this.workday6End = workday6End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6Increment
-     */
-    public SitePdu workday6Increment(Integer workday6Increment){
-        this.workday6Increment = workday6Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄥ叚 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday6List
-     */
-    public SitePdu workday6List(List<Integer> workday6List){
-        this.workday6List = workday6List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7
-     */
-    public SitePdu workday7(Integer workday7){
-        setWorkday7(workday7);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7Start
-     */
-    public SitePdu workday7Start(Integer workday7Start){
-        this.workday7Start = workday7Start;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7End
-     */
-    public SitePdu workday7End(Integer workday7End){
-        this.workday7End = workday7End;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7Increment
-     */
-    public SitePdu workday7Increment(Integer workday7Increment){
-        this.workday7Increment = workday7Increment;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍛ㄦ棩 (1.涓婄彮锛�0.涓嶄笂)
-     * @param workday7List
-     */
-    public SitePdu workday7List(List<Integer> workday7List){
-        this.workday7List = workday7List;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  妤煎眰
-     * @param level
-     */
-    public SitePdu level(Integer level){
-        setLevel(level);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 妤煎眰
-     * @param levelStart
-     */
-    public SitePdu levelStart(Integer levelStart){
-        this.levelStart = levelStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 妤煎眰
-     * @param levelEnd
-     */
-    public SitePdu levelEnd(Integer levelEnd){
-        this.levelEnd = levelEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 妤煎眰
-     * @param levelIncrement
-     */
-    public SitePdu levelIncrement(Integer levelIncrement){
-        this.levelIncrement = levelIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 妤煎眰
-     * @param levelList
-     */
-    public SitePdu levelList(List<Integer> levelList){
-        this.levelList = levelList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  妤兼爧
-     * @param building
-     */
-    public SitePdu building(Integer building){
-        setBuilding(building);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 妤兼爧
-     * @param buildingStart
-     */
-    public SitePdu buildingStart(Integer buildingStart){
-        this.buildingStart = buildingStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 妤兼爧
-     * @param buildingEnd
-     */
-    public SitePdu buildingEnd(Integer buildingEnd){
-        this.buildingEnd = buildingEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 妤兼爧
-     * @param buildingIncrement
-     */
-    public SitePdu buildingIncrement(Integer buildingIncrement){
-        this.buildingIncrement = buildingIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 妤兼爧
-     * @param buildingList
-     */
-    public SitePdu buildingList(List<Integer> buildingList){
-        this.buildingList = buildingList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSite
-     */
-    public SitePdu isSite(Integer isSite){
-        setIsSite(isSite);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteStart
-     */
-    public SitePdu isSiteStart(Integer isSiteStart){
-        this.isSiteStart = isSiteStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteEnd
-     */
-    public SitePdu isSiteEnd(Integer isSiteEnd){
-        this.isSiteEnd = isSiteEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteIncrement
-     */
-    public SitePdu isSiteIncrement(Integer isSiteIncrement){
-        this.isSiteIncrement = isSiteIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鏄惁鏄珯鐐�  (1.鏄�,0.鍚�)
-     * @param isSiteList
-     */
-    public SitePdu isSiteList(List<Integer> isSiteList){
-        this.isSiteList = isSiteList;
-        return this;
-    }
-
-    /**
-     * 璁剧疆  绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param status
-     */
-    public SitePdu status(Integer status){
-        setStatus(status);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusStart
-     */
-    public SitePdu statusStart(Integer statusStart){
-        this.statusStart = statusStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusEnd
-     */
-    public SitePdu statusEnd(Integer statusEnd){
-        this.statusEnd = statusEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusIncrement
-     */
-    public SitePdu statusIncrement(Integer statusIncrement){
-        this.statusIncrement = statusIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鐘舵€� (0.鍋滅敤锛�1.姝e父)
-     * @param statusList
-     */
-    public SitePdu statusList(List<Integer> statusList){
-        this.statusList = statusList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 璁惧logo鍦板潃
-     * @param logoPath
-     */
-    public SitePdu logoPath(String logoPath){
-        setLogoPath(logoPath);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 璁惧logo鍦板潃
-     * @param logoPathList
-     */
-    public SitePdu logoPathList(List<String> logoPathList){
-        this.logoPathList = logoPathList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
-     * @param englishName
-     */
-    public SitePdu englishName(String englishName){
-        setEnglishName(englishName);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 绔欑偣鑻辨枃鍚嶇О
-     * @param englishNameList
-     */
-    public SitePdu englishNameList(List<String> englishNameList){
-        this.englishNameList = englishNameList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 璐熻矗浜�
-     * @param leadingOfficial
-     */
-    public SitePdu leadingOfficial(String leadingOfficial){
-        setLeadingOfficial(leadingOfficial);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 璐熻矗浜�
-     * @param leadingOfficialList
-     */
-    public SitePdu leadingOfficialList(List<String> leadingOfficialList){
-        this.leadingOfficialList = leadingOfficialList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆 鑱旂郴鐢佃瘽
-     * @param leadingOfficialTelephone
-     */
-    public SitePdu leadingOfficialTelephone(String leadingOfficialTelephone){
-        setLeadingOfficialTelephone(leadingOfficialTelephone);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鑱旂郴鐢佃瘽
-     * @param leadingOfficialTelephoneList
-     */
-    public SitePdu leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
-        this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
-        return this;
-    }
-
-
-    /**
-     * 璁剧疆  鍒涘缓鐢ㄦ埛
-     * @param createUserId
-     */
-    public SitePdu createUserId(Long createUserId){
-        setCreateUserId(createUserId);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-     * @param createUserIdStart
-     */
-    public SitePdu createUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-     * @param createUserIdEnd
-     */
-    public SitePdu createUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-     * @param createUserIdIncrement
-     */
-    public SitePdu createUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-        return this;
-    }
-
-    /**
-     * 璁剧疆 鍒涘缓鐢ㄦ埛
-     * @param createUserIdList
-     */
-    public SitePdu createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-        return this;
-    }
-
-
-
-    /**
-     * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
-     * @param modelIds
-     */
-    public SitePdu modelIds(String modelIds){
-        setModelIds(modelIds);
-        return this;
-    }
-
-    /**
-     * 璁剧疆 閮ㄧ讲妯″潡锛岄€楀彿鍒嗛殧
-     * @param modelIdsList
-     */
-    public SitePdu modelIdsList(List<String> modelIdsList){
-        this.modelIdsList = modelIdsList;
-        return this;
-    }
-
-
-    /**
-     * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-     * @return orConditionList
-     */
-    public List<SitePdu> getOrConditionList(){
-        return this.orConditionList;
-    }
-
-    /**
-     * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-     * @param orConditionList
-     */
-    public void setOrConditionList(List<SitePdu> orConditionList){
-        this.orConditionList = orConditionList;
-    }
-
-    /**
-     * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-     * @return andConditionList
-     */
-    public List<SitePdu> getAndConditionList(){
-        return this.andConditionList;
-    }
-
-    /**
-     * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-     * @param andConditionList
-     */
-    public void setAndConditionList(List<SitePdu> andConditionList){
-        this.andConditionList = andConditionList;
-    }
-
-    @Override
-    public int hashCode() {
-        return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof SitePdu) {
-            SitePdu tmp = (SitePdu) obj;
-            if (this.getId() == tmp.getId()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void initAttrValue(){
-
-        this.siteName = "";
-
-        this.parentId = null;
-
-        this.ancestors = "";
-
-        this.regionCode = "";
-
-        this.iid = "";
-
-        this.siteCode = "";
-
-        this.proCode = "";
-
-        this.areaID = "";
-
-        this.areaCode = "";
-
-        this.cityCode = "";
-
-        this.districtCode = "";
-
-        this.siteIp = "";
-
-        this.sitePort = "";
-
-        this.longitude = "";
-
-        this.latitude = "";
-
-        this.haveSonArea = "0";
-
-        this.siteTel = "";
-
-        this.detailAddress = "";
-
-        this.siteRemark = "";
-
-        this.amWorkStartTime = "";
-
-        this.amWorkEndTime = "";
-
-        this.pmWorkStartTime = "";
-
-        this.pmWorkEndTime = "";
-
-        this.averageTime = null;
-
-        this.waitingNumber = null;
-
-        this.workday1 = 1;
-
-        this.workday2 = 1;
-
-        this.workday3 = 1;
-
-        this.workday4 = 1;
-
-        this.workday5 = 1;
-
-        this.workday6 = 0;
-
-        this.workday7 = 0;
-
-        this.level = null;
-
-        this.building = null;
-
-        this.isSite = 0;
-
-        this.status = 1;
-
-        this.logoPath = "";
-
-        this.englishName = "";
-
-        this.leadingOfficial = "";
-
-        this.leadingOfficialTelephone = "";
-
-        this.modelIds = "";
-    }
 }
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/skin/SkinBasePdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/skin/SkinBasePdu.java
index ccd856e36bbb47c72a3c1118888f754ae49dacc6..930a309f81b6016562610bb474b70f92d19d298d 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/skin/SkinBasePdu.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/skin/SkinBasePdu.java
@@ -1,67 +1,61 @@
 package com.mortals.xhx.common.pdu.skin;
-import java.util.Date;
-import java.util.List;
+
 import com.mortals.framework.model.BaseEntityLong;
 import lombok.Data;
+
 /**
-* 绯荤粺鍩虹鐨偆Pdu瀵硅薄
-*
-* @author zxfei
-* @date 2023-04-03
-*/
+ * 绯荤粺鍩虹鐨偆Pdu瀵硅薄
+ *
+ * @author zxfei
+ * @date 2024-09-23
+ */
 @Data
 public class SkinBasePdu extends BaseEntityLong {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 鎵€灞炵绫�,鏉ユ簮绉嶇被
-    */
+     * 鎵€灞炵绫�,鏉ユ簮绉嶇被
+     */
     private Long categoryId;
     /**
-    * 浜у搧id
-    */
+     * 浜у搧id
+     */
     private Long productId;
     /**
-    * 浜у搧鍚嶇О
-    */
+     * 浜у搧鍚嶇О
+     */
     private String productName;
     /**
-    * css妯℃澘鍚堟垚鍚庢枃浠跺湴鍧€
-    */
+     * css妯℃澘鍚堟垚鍚庢枃浠跺湴鍧€
+     */
     private String cssFilePath;
     /**
-    * 鎺掑簭缂栧彿
-    */
+     * 鎺掑簭缂栧彿
+     */
     private Integer sortNum;
     /**
-    * 浜у搧鐨偆鍚嶇О锛屽敮涓€涓斾笉涓虹┖
-    */
+     * 浜у搧鐨偆鍚嶇О锛屽敮涓€涓斾笉涓虹┖
+     */
     private String name;
     /**
-    * 鍒嗚鲸鐜� (1.1920*1080锛�2.1080*1920锛�3.1280*1280)
-    */
+     * 鍒嗚鲸鐜� (1.1920*1080锛�2.1080*1920锛�3.1280*1280)
+     */
     private String imageResolution;
     /**
-    * 棰勮鍥剧墖
-    */
+     * 棰勮鍥剧墖
+     */
     private String previewImagePath;
+    /**
+     * 浜у搧缂栫爜
+     */
+    private String productCode;
 
-public void initAttrValue(){
-
-            this.categoryId = null;
-
-            this.productId = null;
-
-            this.productName = "";
-
-            this.cssFilePath = "";
-
-            this.sortNum = null;
+    private String imageResolutionValue;
+    private String serverName;
 
-            this.name = "";
+    private Integer serverPort;
 
-            this.imageResolution = "1";
+    private String localZipPath;
 
-            this.previewImagePath = "";
-    }
+    private String prependPath;
 }
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/LoginPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/LoginPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f388a27f8ec7479bef47472b7796f1383802582
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/LoginPdu.java
@@ -0,0 +1,34 @@
+package com.mortals.xhx.common.pdu.user;
+
+import com.mortals.framework.exception.AppException;
+import lombok.Data;
+
+
+@Data
+public class LoginPdu {
+    private String loginName;
+
+    private String password;
+
+    private String securityCode;
+
+    private String mark;
+    /** 鍔犲瘑鏂瑰紡 1涓嶅姞瀵嗭紝2鍔犲瘑*/
+    private Integer type;
+
+
+    @Override
+    public String toString() {
+        return "loginName:" + this.loginName + "  password:" + this.password;
+    }
+
+    public boolean validate() throws AppException {
+        if (loginName == null || loginName.trim().length() == 0) {
+            throw new AppException("甯愬彿涓嶈兘涓虹┖锛�");
+        }
+        if (password == null || password.trim().length() == 0) {
+            throw new AppException("瀵嗙爜涓嶈兘涓虹┖锛�");
+        }
+        return true;
+    }
+}
diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
index e1ddd2820c2c23581d63f6e7c25f0746852c300a..47ef7609227f10c473c067ef253100837dc4e435 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
@@ -1,1405 +1,78 @@
 package com.mortals.xhx.common.pdu.user;
 
 import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
-
 /**
-* 鐢ㄦ埛淇℃伅涓氬姟Pdu瀵硅薄
-*
-* @author zxfei
-* @date 2022-07-06
-*/
-
+ * 鐢ㄦ埛淇℃伅涓氬姟Pdu瀵硅薄
+ *
+ * @author zxfei
+ * @date 2024-09-23
+ */
+@Data
 public class UserPdu extends BaseEntityLong {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 鐧诲綍鍚�
-    */
+     * 鐧诲綍鍚�
+     */
     private String loginName;
     /**
-    * 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    */
+     * 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+     */
     private String loginPwd;
-
-    private String password;
-
-    private String securityCode;
     /**
-    * 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    */
+     * 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+     */
     private String loginLimitAddress;
     /**
-    * 鐢ㄦ埛鍚�
-    */
+     * 鐢ㄦ埛鍚�
+     */
     private String realName;
     /**
-    * 鐢ㄦ埛鎵嬫満鍙�
-    */
+     * 鐢ㄦ埛鎵嬫満鍙�
+     */
     private String mobile;
     /**
-    * 鐢ㄦ埛鑱旂郴鐢佃瘽
-    */
+     * 鐢ㄦ埛鑱旂郴鐢佃瘽
+     */
     private String phone;
     /**
-    * 鐢ㄦ埛閭
-    */
+     * 鐢ㄦ埛閭
+     */
     private String email;
     /**
-    * QQ鍙风爜
-    */
+     * QQ鍙风爜
+     */
     private String qq;
     /**
-    * 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    */
+     * 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+     */
     private Integer userType;
     /**
-    * 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    */
+     * 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+     */
     private String siteIds;
     /**
-    * 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    */
+     * 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+     */
     private String areaCodes;
     /**
-    * 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    */
+     * 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+     */
     private Integer status;
     /**
-    * 鍒涘缓鐢ㄦ埛鍚嶇О
-    */
+     * 鍒涘缓鐢ㄦ埛鍚嶇О
+     */
     private String createUserName;
     /**
-    * 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    */
+     * 鏈€鍚庝竴娆$櫥褰曟椂闂�
+     */
     private Date lastLoginTime;
     /**
-    * 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    */
+     * 鏈€鍚庝竴娆$櫥褰曞湴鍧€
+     */
     private String lastLoginAddress;
 
-    /** 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀� */
-    private Long idStart;
-
-    /** 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀� */
-    private Long idEnd;
-
-    /** 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀� */
-    private Long idIncrement;
-
-    /** 鐢ㄦ埛ID锛屼富閿紝鑷闀垮垪琛� */
-    private List <Long> idList;
-
-    /** 鐧诲綍鍚� */
-    private List<String> loginNameList;
-
-    /** 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑 */
-    private List<String> loginPwdList;
-
-    /** 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍 */
-    private List<String> loginLimitAddressList;
-
-    /** 鐢ㄦ埛鍚� */
-    private List<String> realNameList;
-
-    /** 鐢ㄦ埛鎵嬫満鍙� */
-    private List<String> mobileList;
-
-    /** 鐢ㄦ埛鑱旂郴鐢佃瘽 */
-    private List<String> phoneList;
-
-    /** 鐢ㄦ埛閭 */
-    private List<String> emailList;
-
-    /** QQ鍙风爜 */
-    private List<String> qqList;
-
-    /** 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳) */
-    private Integer userTypeStart;
-
-    /** 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳) */
-    private Integer userTypeEnd;
-
-    /** 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳) */
-    private Integer userTypeIncrement;
-
-    /** 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)鍒楄〃 */
-    private List <Integer> userTypeList;
-
-    /** 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧 */
-    private List<String> siteIdsList;
-
-    /** 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧 */
-    private List<String> areaCodesList;
-
-    /** 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴) */
-    private Integer statusStart;
-
-    /** 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴) */
-    private Integer statusEnd;
-
-    /** 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴) */
-    private Integer statusIncrement;
-
-    /** 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)鍒楄〃 */
-    private List <Integer> statusList;
-
-    /** 寮€濮� 鍒涘缓鏃堕棿 */
-    private String createTimeStart;
-
-    /** 缁撴潫 鍒涘缓鏃堕棿 */
-    private String createTimeEnd;
-
-    /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdStart;
-
-    /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdEnd;
-
-    /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
-    private Long createUserIdIncrement;
-
-    /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
-    private List <Long> createUserIdList;
-
-    /** 鍒涘缓鐢ㄦ埛鍚嶇О */
-    private List<String> createUserNameList;
-
-    /** 寮€濮� 鏈€鍚庝竴娆$櫥褰曟椂闂� */
-    private String lastLoginTimeStart;
-
-    /** 缁撴潫 鏈€鍚庝竴娆$櫥褰曟椂闂� */
-    private String lastLoginTimeEnd;
-
-    /** 鏈€鍚庝竴娆$櫥褰曞湴鍧€ */
-    private List<String> lastLoginAddressList;
-
-
-    /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<UserPdu> orConditionList;
-
-    /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<UserPdu> andConditionList;
-
-    public UserPdu(){}
-    /**
-    * 鑾峰彇 鐧诲綍鍚�
-    * @return String
-    */
-    public String getLoginName(){
-        return loginName;
-    }
-    /**
-    * 璁剧疆 鐧诲綍鍚�
-    * @param loginName
-    */
-    public void setLoginName(String loginName){
-        this.loginName = loginName;
-    }
-    /**
-    * 鑾峰彇 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    * @return String
-    */
-    public String getLoginPwd(){
-        return loginPwd;
-    }
-    /**
-    * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    * @param loginPwd
-    */
-    public void setLoginPwd(String loginPwd){
-        this.loginPwd = loginPwd;
-    }
-    /**
-    * 鑾峰彇 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    * @return String
-    */
-    public String getLoginLimitAddress(){
-        return loginLimitAddress;
-    }
-    /**
-    * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    * @param loginLimitAddress
-    */
-    public void setLoginLimitAddress(String loginLimitAddress){
-        this.loginLimitAddress = loginLimitAddress;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鍚�
-    * @return String
-    */
-    public String getRealName(){
-        return realName;
-    }
-    /**
-    * 璁剧疆 鐢ㄦ埛鍚�
-    * @param realName
-    */
-    public void setRealName(String realName){
-        this.realName = realName;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鎵嬫満鍙�
-    * @return String
-    */
-    public String getMobile(){
-        return mobile;
-    }
-    /**
-    * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
-    * @param mobile
-    */
-    public void setMobile(String mobile){
-        this.mobile = mobile;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鑱旂郴鐢佃瘽
-    * @return String
-    */
-    public String getPhone(){
-        return phone;
-    }
-    /**
-    * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
-    * @param phone
-    */
-    public void setPhone(String phone){
-        this.phone = phone;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛閭
-    * @return String
-    */
-    public String getEmail(){
-        return email;
-    }
-    /**
-    * 璁剧疆 鐢ㄦ埛閭
-    * @param email
-    */
-    public void setEmail(String email){
-        this.email = email;
-    }
-    /**
-    * 鑾峰彇 QQ鍙风爜
-    * @return String
-    */
-    public String getQq(){
-        return qq;
-    }
-    /**
-    * 璁剧疆 QQ鍙风爜
-    * @param qq
-    */
-    public void setQq(String qq){
-        this.qq = qq;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @return Integer
-    */
-    public Integer getUserType(){
-        return userType;
-    }
-    /**
-    * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userType
-    */
-    public void setUserType(Integer userType){
-        this.userType = userType;
-    }
-    /**
-    * 鑾峰彇 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    * @return String
-    */
-    public String getSiteIds(){
-        return siteIds;
-    }
-    /**
-    * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    * @param siteIds
-    */
-    public void setSiteIds(String siteIds){
-        this.siteIds = siteIds;
-    }
-    /**
-    * 鑾峰彇 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    * @return String
-    */
-    public String getAreaCodes(){
-        return areaCodes;
-    }
-    /**
-    * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    * @param areaCodes
-    */
-    public void setAreaCodes(String areaCodes){
-        this.areaCodes = areaCodes;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @return Integer
-    */
-    public Integer getStatus(){
-        return status;
-    }
-    /**
-    * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param status
-    */
-    public void setStatus(Integer status){
-        this.status = status;
-    }
-    /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @return String
-    */
-    public String getCreateUserName(){
-        return createUserName;
-    }
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserName
-    */
-    public void setCreateUserName(String createUserName){
-        this.createUserName = createUserName;
-    }
-    /**
-    * 鑾峰彇 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    * @return Date
-    */
-    public Date getLastLoginTime(){
-        return lastLoginTime;
-    }
-    /**
-    * 璁剧疆 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    * @param lastLoginTime
-    */
-    public void setLastLoginTime(Date lastLoginTime){
-        this.lastLoginTime = lastLoginTime;
-    }
-    /**
-    * 鑾峰彇 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    * @return String
-    */
-    public String getLastLoginAddress(){
-        return lastLoginAddress;
-    }
-    /**
-    * 璁剧疆 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    * @param lastLoginAddress
-    */
-    public void setLastLoginAddress(String lastLoginAddress){
-        this.lastLoginAddress = lastLoginAddress;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @return idStart
-    */
-    public Long getIdStart(){
-        return this.idStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idStart
-    */
-    public void setIdStart(Long idStart){
-        this.idStart = idStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @return $idEnd
-    */
-    public Long getIdEnd(){
-        return this.idEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
-    public void setIdEnd(Long idEnd){
-        this.idEnd = idEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @return idIncrement
-    */
-    public Long getIdIncrement(){
-        return this.idIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
-    public void setIdIncrement(Long idIncrement){
-        this.idIncrement = idIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @return idList
-    */
-    public List<Long> getIdList(){
-        return this.idList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idList
-    */
-    public void setIdList(List<Long> idList){
-        this.idList = idList;
-    }
-
-    /**
-    * 鑾峰彇 鐧诲綍鍚�
-    * @return loginNameList
-    */
-    public List<String> getLoginNameList(){
-        return this.loginNameList;
-    }
-
-    /**
-    * 璁剧疆 鐧诲綍鍚�
-    * @param loginNameList
-    */
-    public void setLoginNameList(List<String> loginNameList){
-        this.loginNameList = loginNameList;
-    }
-    /**
-    * 鑾峰彇 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    * @return loginPwdList
-    */
-    public List<String> getLoginPwdList(){
-        return this.loginPwdList;
-    }
-
-    /**
-    * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    * @param loginPwdList
-    */
-    public void setLoginPwdList(List<String> loginPwdList){
-        this.loginPwdList = loginPwdList;
-    }
-    /**
-    * 鑾峰彇 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    * @return loginLimitAddressList
-    */
-    public List<String> getLoginLimitAddressList(){
-        return this.loginLimitAddressList;
-    }
-
-    /**
-    * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    * @param loginLimitAddressList
-    */
-    public void setLoginLimitAddressList(List<String> loginLimitAddressList){
-        this.loginLimitAddressList = loginLimitAddressList;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鍚�
-    * @return realNameList
-    */
-    public List<String> getRealNameList(){
-        return this.realNameList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鍚�
-    * @param realNameList
-    */
-    public void setRealNameList(List<String> realNameList){
-        this.realNameList = realNameList;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鎵嬫満鍙�
-    * @return mobileList
-    */
-    public List<String> getMobileList(){
-        return this.mobileList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
-    * @param mobileList
-    */
-    public void setMobileList(List<String> mobileList){
-        this.mobileList = mobileList;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛鑱旂郴鐢佃瘽
-    * @return phoneList
-    */
-    public List<String> getPhoneList(){
-        return this.phoneList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
-    * @param phoneList
-    */
-    public void setPhoneList(List<String> phoneList){
-        this.phoneList = phoneList;
-    }
-    /**
-    * 鑾峰彇 鐢ㄦ埛閭
-    * @return emailList
-    */
-    public List<String> getEmailList(){
-        return this.emailList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛閭
-    * @param emailList
-    */
-    public void setEmailList(List<String> emailList){
-        this.emailList = emailList;
-    }
-    /**
-    * 鑾峰彇 QQ鍙风爜
-    * @return qqList
-    */
-    public List<String> getQqList(){
-        return this.qqList;
-    }
-
-    /**
-    * 璁剧疆 QQ鍙风爜
-    * @param qqList
-    */
-    public void setQqList(List<String> qqList){
-        this.qqList = qqList;
-    }
-    /**
-    * 鑾峰彇 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @return userTypeStart
-    */
-    public Integer getUserTypeStart(){
-        return this.userTypeStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeStart
-    */
-    public void setUserTypeStart(Integer userTypeStart){
-        this.userTypeStart = userTypeStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @return $userTypeEnd
-    */
-    public Integer getUserTypeEnd(){
-        return this.userTypeEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeEnd
-    */
-    public void setUserTypeEnd(Integer userTypeEnd){
-        this.userTypeEnd = userTypeEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @return userTypeIncrement
-    */
-    public Integer getUserTypeIncrement(){
-        return this.userTypeIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeIncrement
-    */
-    public void setUserTypeIncrement(Integer userTypeIncrement){
-        this.userTypeIncrement = userTypeIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @return userTypeList
-    */
-    public List<Integer> getUserTypeList(){
-        return this.userTypeList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeList
-    */
-    public void setUserTypeList(List<Integer> userTypeList){
-        this.userTypeList = userTypeList;
-    }
-
-    /**
-    * 鑾峰彇 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    * @return siteIdsList
-    */
-    public List<String> getSiteIdsList(){
-        return this.siteIdsList;
-    }
-
-    /**
-    * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    * @param siteIdsList
-    */
-    public void setSiteIdsList(List<String> siteIdsList){
-        this.siteIdsList = siteIdsList;
-    }
-    /**
-    * 鑾峰彇 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    * @return areaCodesList
-    */
-    public List<String> getAreaCodesList(){
-        return this.areaCodesList;
-    }
-
-    /**
-    * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    * @param areaCodesList
-    */
-    public void setAreaCodesList(List<String> areaCodesList){
-        this.areaCodesList = areaCodesList;
-    }
-    /**
-    * 鑾峰彇 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @return statusStart
-    */
-    public Integer getStatusStart(){
-        return this.statusStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusStart
-    */
-    public void setStatusStart(Integer statusStart){
-        this.statusStart = statusStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @return $statusEnd
-    */
-    public Integer getStatusEnd(){
-        return this.statusEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusEnd
-    */
-    public void setStatusEnd(Integer statusEnd){
-        this.statusEnd = statusEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @return statusIncrement
-    */
-    public Integer getStatusIncrement(){
-        return this.statusIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusIncrement
-    */
-    public void setStatusIncrement(Integer statusIncrement){
-        this.statusIncrement = statusIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @return statusList
-    */
-    public List<Integer> getStatusList(){
-        return this.statusList;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusList
-    */
-    public void setStatusList(List<Integer> statusList){
-        this.statusList = statusList;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
-    * @return createTimeStart
-    */
-    public String getCreateTimeStart(){
-        return this.createTimeStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
-    * @param createTimeStart
-    */
-    public void setCreateTimeStart(String createTimeStart){
-        this.createTimeStart = createTimeStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
-    * @return createTimeEnd
-    */
-    public String getCreateTimeEnd(){
-        return this.createTimeEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
-    * @param createTimeEnd
-    */
-    public void setCreateTimeEnd(String createTimeEnd){
-        this.createTimeEnd = createTimeEnd;
-    }
-
-    /**
-    * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @return createUserIdStart
-    */
-    public Long getCreateUserIdStart(){
-        return this.createUserIdStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
-    public void setCreateUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @return $createUserIdEnd
-    */
-    public Long getCreateUserIdEnd(){
-        return this.createUserIdEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
-    public void setCreateUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-    }
-
-    /**
-    * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @return createUserIdIncrement
-    */
-    public Long getCreateUserIdIncrement(){
-        return this.createUserIdIncrement;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
-    public void setCreateUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-    }
-
-    /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛
-    * @return createUserIdList
-    */
-    public List<Long> getCreateUserIdList(){
-        return this.createUserIdList;
-    }
-
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
-    public void setCreateUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-    }
-
-    /**
-    * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @return createUserNameList
-    */
-    public List<String> getCreateUserNameList(){
-        return this.createUserNameList;
-    }
-
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserNameList
-    */
-    public void setCreateUserNameList(List<String> createUserNameList){
-        this.createUserNameList = createUserNameList;
-    }
-    /**
-    * 鑾峰彇 寮€濮� 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    * @return lastLoginTimeStart
-    */
-    public String getLastLoginTimeStart(){
-        return this.lastLoginTimeStart;
-    }
-
-    /**
-    * 璁剧疆 寮€濮� 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    * @param lastLoginTimeStart
-    */
-    public void setLastLoginTimeStart(String lastLoginTimeStart){
-        this.lastLoginTimeStart = lastLoginTimeStart;
-    }
-
-    /**
-    * 鑾峰彇 缁撴潫 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    * @return lastLoginTimeEnd
-    */
-    public String getLastLoginTimeEnd(){
-        return this.lastLoginTimeEnd;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鏈€鍚庝竴娆$櫥褰曟椂闂�
-    * @param lastLoginTimeEnd
-    */
-    public void setLastLoginTimeEnd(String lastLoginTimeEnd){
-        this.lastLoginTimeEnd = lastLoginTimeEnd;
-    }
-
-    /**
-    * 鑾峰彇 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    * @return lastLoginAddressList
-    */
-    public List<String> getLastLoginAddressList(){
-        return this.lastLoginAddressList;
-    }
-
-    /**
-    * 璁剧疆 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    * @param lastLoginAddressList
-    */
-    public void setLastLoginAddressList(List<String> lastLoginAddressList){
-        this.lastLoginAddressList = lastLoginAddressList;
-    }
-    /**
-    * 璁剧疆  鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param id
-    */
-    public UserPdu id(Long id){
-	    setId(id);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idStart
-    */
-    public UserPdu idStart(Long idStart){
-		this.idStart = idStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idEnd
-    */
-    public UserPdu idEnd(Long idEnd){
-		this.idEnd = idEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idIncrement
-    */
-    public UserPdu idIncrement(Long idIncrement){
-		this.idIncrement = idIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛ID锛屼富閿紝鑷闀�
-    * @param idList
-    */
-    public UserPdu idList(List<Long> idList){
-        this.idList = idList;
-		return this;
-        }
-
-
-	/**
-    * 璁剧疆 鐧诲綍鍚�
-    * @param loginName
-    */
-    public UserPdu loginName(String loginName){
-        setLoginName(loginName);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐧诲綍鍚�
-    * @param loginNameList
-    */
-    public UserPdu loginNameList(List<String> loginNameList){
-        this.loginNameList = loginNameList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    * @param loginPwd
-    */
-    public UserPdu loginPwd(String loginPwd){
-        setLoginPwd(loginPwd);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
-    * @param loginPwdList
-    */
-    public UserPdu loginPwdList(List<String> loginPwdList){
-        this.loginPwdList = loginPwdList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    * @param loginLimitAddress
-    */
-    public UserPdu loginLimitAddress(String loginLimitAddress){
-        setLoginLimitAddress(loginLimitAddress);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
-    * @param loginLimitAddressList
-    */
-    public UserPdu loginLimitAddressList(List<String> loginLimitAddressList){
-        this.loginLimitAddressList = loginLimitAddressList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鐢ㄦ埛鍚�
-    * @param realName
-    */
-    public UserPdu realName(String realName){
-        setRealName(realName);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鍚�
-    * @param realNameList
-    */
-    public UserPdu realNameList(List<String> realNameList){
-        this.realNameList = realNameList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
-    * @param mobile
-    */
-    public UserPdu mobile(String mobile){
-        setMobile(mobile);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
-    * @param mobileList
-    */
-    public UserPdu mobileList(List<String> mobileList){
-        this.mobileList = mobileList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
-    * @param phone
-    */
-    public UserPdu phone(String phone){
-        setPhone(phone);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
-    * @param phoneList
-    */
-    public UserPdu phoneList(List<String> phoneList){
-        this.phoneList = phoneList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鐢ㄦ埛閭
-    * @param email
-    */
-    public UserPdu email(String email){
-        setEmail(email);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛閭
-    * @param emailList
-    */
-    public UserPdu emailList(List<String> emailList){
-        this.emailList = emailList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 QQ鍙风爜
-    * @param qq
-    */
-    public UserPdu qq(String qq){
-        setQq(qq);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 QQ鍙风爜
-    * @param qqList
-    */
-    public UserPdu qqList(List<String> qqList){
-        this.qqList = qqList;
-		return this;
-    }
-
-    /**
-    * 璁剧疆  鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userType
-    */
-    public UserPdu userType(Integer userType){
-	    setUserType(userType);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeStart
-    */
-    public UserPdu userTypeStart(Integer userTypeStart){
-		this.userTypeStart = userTypeStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeEnd
-    */
-    public UserPdu userTypeEnd(Integer userTypeEnd){
-		this.userTypeEnd = userTypeEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeIncrement
-    */
-    public UserPdu userTypeIncrement(Integer userTypeIncrement){
-		this.userTypeIncrement = userTypeIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
-    * @param userTypeList
-    */
-    public UserPdu userTypeList(List<Integer> userTypeList){
-        this.userTypeList = userTypeList;
-		return this;
-        }
-
-
-	/**
-    * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    * @param siteIds
-    */
-    public UserPdu siteIds(String siteIds){
-        setSiteIds(siteIds);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
-    * @param siteIdsList
-    */
-    public UserPdu siteIdsList(List<String> siteIdsList){
-        this.siteIdsList = siteIdsList;
-		return this;
-    }
-
-
-	/**
-    * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    * @param areaCodes
-    */
-    public UserPdu areaCodes(String areaCodes){
-        setAreaCodes(areaCodes);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
-    * @param areaCodesList
-    */
-    public UserPdu areaCodesList(List<String> areaCodesList){
-        this.areaCodesList = areaCodesList;
-		return this;
-    }
-
-    /**
-    * 璁剧疆  鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param status
-    */
-    public UserPdu status(Integer status){
-	    setStatus(status);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusStart
-    */
-    public UserPdu statusStart(Integer statusStart){
-		this.statusStart = statusStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusEnd
-    */
-    public UserPdu statusEnd(Integer statusEnd){
-		this.statusEnd = statusEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusIncrement
-    */
-    public UserPdu statusIncrement(Integer statusIncrement){
-		this.statusIncrement = statusIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝e父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
-    * @param statusList
-    */
-    public UserPdu statusList(List<Integer> statusList){
-        this.statusList = statusList;
-		return this;
-        }
-
-
-    /**
-    * 璁剧疆  鍒涘缓鐢ㄦ埛
-    * @param createUserId
-    */
-    public UserPdu createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
-		return this;
-    }
-
-	 /**
-    * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
-    * @param createUserIdStart
-    */
-    public UserPdu createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
-    * @param createUserIdEnd
-    */
-    public UserPdu createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
-    * @param createUserIdIncrement
-    */
-    public UserPdu createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛
-    * @param createUserIdList
-    */
-    public UserPdu createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
-		return this;
-        }
-
-
-	/**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserName
-    */
-    public UserPdu createUserName(String createUserName){
-        setCreateUserName(createUserName);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
-    * @param createUserNameList
-    */
-    public UserPdu createUserNameList(List<String> createUserNameList){
-        this.createUserNameList = createUserNameList;
-		return this;
-    }
-
-
-
-	/**
-    * 璁剧疆 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    * @param lastLoginAddress
-    */
-    public UserPdu lastLoginAddress(String lastLoginAddress){
-        setLastLoginAddress(lastLoginAddress);
-		return this;
-    }
-
-    /**
-    * 璁剧疆 鏈€鍚庝竴娆$櫥褰曞湴鍧€
-    * @param lastLoginAddressList
-    */
-    public UserPdu lastLoginAddressList(List<String> lastLoginAddressList){
-        this.lastLoginAddressList = lastLoginAddressList;
-		return this;
-    }
-
-
-/**
-    * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
-    public List<UserPdu> getOrConditionList(){
-    return this.orConditionList;
-    }
-
-    /**
-    * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
-    public void setOrConditionList(List<UserPdu> orConditionList){
-        this.orConditionList = orConditionList;
-    }
-
-    /**
-    * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
-    public List<UserPdu> getAndConditionList(){
-        return this.andConditionList;
-    }
-
-    /**
-    * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
-    public void setAndConditionList(List<UserPdu> andConditionList){
-        this.andConditionList = andConditionList;
-    }
-
-    public String getSecurityCode() {
-        return securityCode;
-    }
-
-    public void setSecurityCode(String securityCode) {
-        this.securityCode = securityCode;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    @Override
-    public int hashCode() {
-         return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof UserPdu) {
-            UserPdu tmp = (UserPdu) obj;
-            if (this.getId() == tmp.getId()) {
-                 return true;
-            }
-        }
-        return false;
-    }
-
-    public void initAttrValue(){
-
-            this.loginName = "";
-
-            this.loginPwd = "";
-
-            this.loginLimitAddress = "";
-
-            this.realName = "";
-
-            this.mobile = "";
-
-            this.phone = "";
-
-            this.email = "";
-
-            this.qq = "";
-
-            this.userType = null;
-
-            this.siteIds = "";
-
-            this.areaCodes = "";
-
-            this.status = 1;
-
-            this.createUserName = "";
-
-            this.lastLoginTime = null;
-
-            this.lastLoginAddress = "";
-    }
 }
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
index 20aa80a2e998fcf4984cf1c055a9affd2be2d2d0..3681e48b0f1ea48362aa49f9bd9f074235a805c0 100644
--- a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
@@ -1,8 +1,8 @@
 package com.mortals.xhx.feign.user;
 
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.LoginPdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
@@ -62,7 +62,7 @@ public interface IUserFeign extends IFeign {
 
 
     @PostMapping(value = "/login/login")
-    String portalLogin(@RequestBody UserPdu userPdu);
+    String portalLogin(@RequestBody LoginPdu loginPdu);
 
     /**
      * 鏌ヨ鐢ㄦ埛鍒楄〃
@@ -114,8 +114,8 @@ class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
             }
 
             @Override
-            public String portalLogin(UserPdu userPdu) {
-                return JSON.toJSONString(Rest.fail("鐧诲綍澶辫触!"));
+            public String portalLogin(LoginPdu loginPdu) {
+                return null;
             }
 
             @Override
diff --git a/sample-form-manager/pom.xml b/sample-form-manager/pom.xml
index 9b203b259f07f1bdb2c14595f8e3883f59c9a42a..c977e9446eb3bb9ba9612957b534f2b2152d9c74 100644
--- a/sample-form-manager/pom.xml
+++ b/sample-form-manager/pom.xml
@@ -23,6 +23,10 @@
         <profiles.log.level>info</profiles.log.level>
         <profiles.publish.path>/home/publish</profiles.publish.path>
         <profiles.filepath>/mortals/app/data</profiles.filepath>
+        <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+        <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+        <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+        <package.environment>build</package.environment>
     </properties>
 
 
@@ -65,6 +69,15 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>qiling</id>
+            <properties>
+                <profiles.active>qiling</profiles.active>
+
+                <skipUi>false</skipUi>
+            </properties>
+        </profile>
+
         <profile>
             <id>yibin</id>
             <properties>
diff --git a/sample-form-manager/pom.xml.bak b/sample-form-manager/pom.xml.bak
deleted file mode 100644
index 5e8bf1e294525825e6280658b740b5d758c569ae..0000000000000000000000000000000000000000
--- a/sample-form-manager/pom.xml.bak
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.mortals.xhx</groupId>
-        <artifactId>sample-form-platform</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>sample-form-manager</artifactId>
-    <packaging>jar</packaging>
-    <description>鏍疯〃鏈嶅姟绠$悊骞冲彴</description>
-
-    <properties>
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>develop</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <profiles.active>develop</profiles.active>
-                <profiles.server.port>17002</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
-                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
-                <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <package.environment>serve</package.environment>
-                <skipUi>false</skipUi>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <profiles.active>test</profiles.active>
-                <profiles.server.port>17002</profiles.server.port>
-                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
-                <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-     <!--           <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>-->
-                <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <package.environment>test</package.environment>
-                <skipUi>false</skipUi>
-            </properties>
-        </profile>
-        <profile>
-            <id>product</id>
-            <properties>
-                <profiles.active>product</profiles.active>
-                <profiles.server.port>17002</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
-                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
-                <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.rabbitmq.host>192.168.0.250</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>yibin</id>
-            <properties>
-                <profiles.active>yibin</profiles.active>
-                <profiles.server.port>17002</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
-                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
-                <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.rabbitmq.host>172.15.28.117</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
-
-            </properties>
-        </profile>
-
-        <profile>
-            <id>xuanhan</id>
-            <properties>
-                <profiles.active>xuanhan</profiles.active>
-                <profiles.server.port>17002</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
-                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
-                <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>D:/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <profiles.publish.path>D:/home/publish</profiles.publish.path>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
-
-            </properties>
-        </profile>
-
-        <profile>
-            <id>yanyuan</id>
-            <properties>
-                <profiles.active>yanyuan</profiles.active>
-                <profiles.server.port>17002</profiles.server.port>
-                <profiles.nginx.port>11199</profiles.nginx.port>
-                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
-                <profiles.server.path>/sampleform</profiles.server.path>
-                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <profiles.publish.path>D:/home/publish</profiles.publish.path>
-                <package.environment>build</package.environment>
-                <skipUi>false</skipUi>
-
-            </properties>
-        </profile>
-
-    </profiles>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.mortals.xhx</groupId>
-            <artifactId>common-lib</artifactId>
-        </dependency>
-
-        <!-- 寮曞叆 SpringMVC 鐩稿叧渚濊禆锛屽苟瀹炵幇瀵瑰叾鐨勮嚜鍔ㄩ厤缃� -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-            <version>2.5.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.31</version>
-        </dependency>
-
-        <!--Token鐢熸垚涓庤В鏋�-->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aspose.words</groupId>
-            <artifactId>aspose-words</artifactId>
-            <version>19.2</version>
-            <classifier>jdk16</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>com.deepoove</groupId>
-            <artifactId>poi-tl</artifactId>
-            <version>1.12.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itext7-core</artifactId>
-            <version>RELEASE</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>2.0.27</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.7.14</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-
-<!--            <resource>-->
-<!--                <directory>../sample-form-manager-ui/admin</directory>-->
-<!--                <filtering>true</filtering>-->
-<!--            </resource>-->
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <configuration>
-                    <skipTests>true</skipTests>    <!--榛樿鍏虫帀鍗曞厓娴嬭瘯 -->
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <encoding>UTF-8</encoding>
-                            <outputDirectory>target/bin
-                            </outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/bin/</directory>
-                                    <excludes>
-                                        <exclude>deploy.sh</exclude>
-                                    </excludes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>copy-deploy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <encoding>UTF-8</encoding>
-                            <outputDirectory>${project.parent.basedir}/dist/${project.artifactId}/
-                            </outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/bin</directory>
-                                    <includes>
-                                        <include>deploy.sh</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <configuration>
-                    <skip>${skipUi}</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>exec-npm-install</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>yarn</executable>
-                            <arguments>
-                                <argument></argument>
-                            </arguments>
-                            <workingDirectory>${project.parent.basedir}/sample-form-manager-ui/admin</workingDirectory>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>exec-npm-run-build</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>yarn</executable>
-                            <arguments>
-                                <argument>run</argument>
-                                <arguments>${package.environment}</arguments>
-                            </arguments>
-                            <workingDirectory>${project.parent.basedir}/sample-form-manager-ui/admin</workingDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${project.artifactId}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>../assembly/assembly.xml</descriptor>
-                            </descriptors>
-                            <outputDirectory>${project.parent.basedir}/dist/${project.artifactId}</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>make-assembly-ui</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <skipAssembly>${skipUi}</skipAssembly>
-                            <finalName>${project.artifactId}-ui</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>../assembly/assembly-manager-ui.xml</descriptor>
-                            </descriptors>
-                            <outputDirectory>${project.parent.basedir}/dist/${project.artifactId}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java b/sample-form-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java
index e6b891ff9d1c3752ba39f58ba7e49d4a6c8bfb32..4455ca3e88ed48c0b2cf56a78d593cc4e53fd519 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java
@@ -1,42 +1,58 @@
 package com.mortals.xhx.base.framework.exception;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.exception.AppException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.exception.AppException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 缁熶竴寮傚父澶勭悊
  */
 @ControllerAdvice
+@Slf4j
 public class ExceptionHandle {
 
-	private final static Logger log = LoggerFactory.getLogger(ExceptionHandle.class);
+    @Autowired
+    private HttpServletRequest request;
+    @Autowired
+    private HttpServletResponse response;
+
 
-	public static final String KEY_RESULT_CODE = "code";
-	public static final String KEY_RESULT_MSG = "msg";
-	public static final String KEY_RESULT_DATA = "data";
-	public static final int VALUE_RESULT_FAILURE = -1;
+    public static final String KEY_RESULT_CODE = "code";
+    public static final String KEY_RESULT_MSG = "msg";
+    public static final String KEY_RESULT_DATA = "data";
+    public static final int VALUE_RESULT_FAILURE = -1;
 
-	@ExceptionHandler(value = Exception.class)
-	@ResponseBody
-	public String handle(Exception e) {
-		JSONObject ret = new JSONObject();
-		ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-		if (e instanceof AppException) {
-			StackTraceElement stack = e.getStackTrace()[0];
-			log.error("[business error]=========stack message[{}],[{},method:{},line{}][{}]", e.getMessage(),
-					stack.getClassName(), stack.getMethodName(), stack.getLineNumber(), e.getClass().getName());
-			AppException ex = (AppException) e;
-			ret.put(KEY_RESULT_MSG, ex.getMessage());
-		} else {
-			log.error("[system error]", e);
-			ret.put(KEY_RESULT_MSG, "unknown exception!");
-		}
-		return ret.toJSONString();
-	}
+    @ExceptionHandler(value = Exception.class)
+    @ResponseBody
+    public String handle(Exception e) {
+        JSONObject ret = new JSONObject();
+        ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+        if (e instanceof AppException) {
+            StackTraceElement stack = e.getStackTrace()[0];
+            log.error("[business error]=========stack message[{}],[{},method:{},line{}][{}]", e.getMessage(),
+                    stack.getClassName(), stack.getMethodName(), stack.getLineNumber(), e.getClass().getName());
+            AppException ex = (AppException) e;
+            ret.put(KEY_RESULT_MSG, ex.getMessage());
+        }
+        if (e instanceof HttpMessageNotReadableException) {
+            log.error("[system error]", e);
+            response.setStatus(HttpStatus.HTTP_BAD_REQUEST);
+            ret.put(KEY_RESULT_MSG, "鍙傛暟閿欒锛�"+ StrUtil.subBefore(e.getMessage(), ";", false));
+        } else {
+            log.error("[system error]", e);
+            response.setStatus(HttpStatus.HTTP_INTERNAL_ERROR);
+            ret.put(KEY_RESULT_MSG, "鏈煡閿欒!" + e.getMessage());
+        }
+        return ret.toJSONString();
+    }
 }
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/sample-form-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
index 431e7e0fc1b15ce319d2b94d59e45ff6571fab74..a381a9451b8adc0e08b60327e48b914e097e9c90 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
@@ -19,6 +19,7 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.user.LoginPdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.user.IUserFeign;
 import org.apache.commons.logging.Log;
@@ -62,10 +63,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
 
-        UserPdu userPdu = new UserPdu();
-        userPdu.setLoginName(loginName);
-        userPdu.setPassword(password);
-        String resp = userFeign.portalLogin(userPdu);
+        LoginPdu loginPdu = new LoginPdu();
+        loginPdu.setLoginName(loginName);
+        loginPdu.setPassword(password);
+        loginPdu.setSecurityCode("admin");
+        String resp = userFeign.portalLogin(loginPdu);
 
         return resp;
 
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java b/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
index 0e7df44b195ffb1e29457882e9316372d9a8e9a9..b13605504e7ed4946a246d785cddf8aed6caf8cd 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
@@ -1,68 +1,27 @@
 package com.mortals.xhx.daemon.task;
 
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.xhx.base.system.user.model.UserEntity;
-import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
-import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.pdu.RespData;
-import com.mortals.xhx.common.pdu.user.UserPdu;
-import com.mortals.xhx.feign.user.IUserFeign;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.List;
 
 /**
  * 鍚屾鐢ㄦ埛,鍞竴鏍囪瘑涓虹敤鎴峰悕銆�
  */
 @Slf4j
 @Service("SyncUserTask")
-@ConditionalOnExpression("'${platform.type:null}'=='cloud'")
 public class SyncUserTaskImpl implements ITaskExcuteService {
 
-    @Autowired
-    private IUserFeign userFeign;
     @Autowired
     private UserService userService;
 
     @Override
     public void excuteTask(ITask task) throws AppException {
         log.info("鍚屾鐢ㄦ埛浠诲姟");
-        UserPdu userPdu = new UserPdu();
-        userPdu.setPage(1);
-        userPdu.setSize(-1);
-        Rest<RespData<List<UserPdu>>> resp = userFeign.list(userPdu);
-
-        if (resp.getCode() == YesNoEnum.YES.getValue()) {
-            //鍚屾鏇存柊鐢ㄦ埛锛屼互loginname涓哄敮涓€鏍囪瘑锛屽瘑鐮侀粯璁や笌鐢ㄦ埛鐩稿悓
-            resp.getData().getData().forEach(user -> {
-                log.info("loginName:{}", user.getLoginName());
-                UserEntity tempEntity = userService.selectOne(new UserQuery().loginName(user.getLoginName()));
-                if (ObjectUtils.isEmpty(tempEntity)) {
-                    UserEntity userEntity = new UserEntity();
-                    BeanUtils.copyProperties(user, userEntity, new String[]{"id","lastLoginTime", "lastLoginAddress"});
-                    log.info("鏂板:{}", JSON.toJSONString(userEntity));
-                    userService.getUserDao().insert(userEntity);
-                }else {
-                    //鏇存柊鍩烘湰淇℃伅
-                    UserEntity userEntity = new UserEntity();
-                    BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd","userType","status","lastLoginTime", "lastLoginAddress"});
-                    log.info("鏇存柊:{}", JSON.toJSONString(userEntity));
-                    userService.getUserDao().update(userEntity);
-                }
-            });
-        }
-       // log.info("syncUserResp:{}", JSON.toJSONString(resp));
-
+        userService.refreshUser();
     }