Merge branch 'develop' into uat

# Conflicts:
#	core/src/main/java/com/hand/app/zhongDengWang/service/impl/ZdwWsRequestsServiceImpl.java

core/src/main/java/com/hand/app/zhongDengWang/dto/FndZhongDengHeads.java

+package com.hand.app.zhongDengWang.dto;
+
+/**
+ * Auto Generated By Hap Code Generator
+ **/
+
+import com.hand.hap.mybatis.annotation.ExtensionAttribute;
+import com.hand.hap.system.dto.BaseDTO;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@ExtensionAttribute(disable = true)
+@Table(name = "FND_ZHONG_DENG_HEADS")
+public class FndZhongDengHeads extends BaseDTO {
+    @Id
+    @GeneratedValue
+    private Long headId;
+
+    private String contractNumber;
+
+    private String bpName;
+
+    private String upStage;
+
+    private String initRegisterNumber;
+
+    private String amendRegisterNumber;
+
+    private String extendRegisterNumber;
+
+    private String abolishRegisterNumber;
+
+    private String authorizationCode;
+
+    public void setHeadId(Long headId) {
+        this.headId = headId;
+    }
+
+    public Long getHeadId() {
+        return headId;
+    }
+
+    public void setContractNumber(String contractNumber) {
+        this.contractNumber = contractNumber;
+    }
+
+    public String getContractNumber() {
+        return contractNumber;
+    }
+
+    public void setBpName(String bpName) {
+        this.bpName = bpName;
+    }
+
+    public String getBpName() {
+        return bpName;
+    }
+
+    public void setUpStage(String upStage) {
+        this.upStage = upStage;
+    }
+
+    public String getUpStage() {
+        return upStage;
+    }
+
+    public void setInitRegisterNumber(String initRegisterNumber) {
+        this.initRegisterNumber = initRegisterNumber;
+    }
+
+    public String getInitRegisterNumber() {
+        return initRegisterNumber;
+    }
+
+    public void setAmendRegisterNumber(String amendRegisterNumber) {
+        this.amendRegisterNumber = amendRegisterNumber;
+    }
+
+    public String getAmendRegisterNumber() {
+        return amendRegisterNumber;
+    }
+
+    public void setExtendRegisterNumber(String extendRegisterNumber) {
+        this.extendRegisterNumber = extendRegisterNumber;
+    }
+
+    public String getExtendRegisterNumber() {
+        return extendRegisterNumber;
+    }
+
+    public void setAbolishRegisterNumber(String abolishRegisterNumber) {
+        this.abolishRegisterNumber = abolishRegisterNumber;
+    }
+
+    public String getAbolishRegisterNumber() {
+        return abolishRegisterNumber;
+    }
+
+    public void setAuthorizationCode(String authorizationCode) {
+        this.authorizationCode = authorizationCode;
+    }
+
+    public String getAuthorizationCode() {
+        return authorizationCode;
+    }
+
+}

core/src/main/java/com/hand/app/zhongDengWang/mapper/FndZhongDengHeadsMapper.java

+package com.hand.app.zhongDengWang.mapper;
+
+import com.hand.app.zhongDengWang.dto.FndZhongDengHeads;
+import com.hand.hap.mybatis.common.Mapper;
+
+public interface FndZhongDengHeadsMapper extends Mapper<FndZhongDengHeads>{
+
+}
\ No newline at end of file

core/src/main/java/com/hand/app/zhongDengWang/service/IFndZhongDengHeadsService.java

+package com.hand.app.zhongDengWang.service;
+
+import com.hand.app.zhongDengWang.dto.FndZhongDengHeads;
+import com.hand.hap.core.ProxySelf;
+import com.hand.hap.system.service.IBaseService;
+
+public interface IFndZhongDengHeadsService extends IBaseService<FndZhongDengHeads>, ProxySelf<IFndZhongDengHeadsService>{
+
+}
\ No newline at end of file

core/src/main/java/com/hand/app/zhongDengWang/service/impl/FndZhongDengHeadsServiceImpl.java

+package com.hand.app.zhongDengWang.service.impl;
+
+import com.hand.app.zhongDengWang.dto.FndZhongDengHeads;
+import com.hand.app.zhongDengWang.service.IFndZhongDengHeadsService;
+import com.hand.hap.system.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class FndZhongDengHeadsServiceImpl extends BaseServiceImpl<FndZhongDengHeads> implements IFndZhongDengHeadsService {
+
+}
\ No newline at end of file