Merge branch 'yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -168,6 +168,12 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
         originalEntity.setRemark(formDTO.getRemark());
+        originalEntity.setSecretaryName(formDTO.getSecretaryName());
+        originalEntity.setSecretaryMobile(formDTO.getSecretaryMobile());
+        originalEntity.setDutyMobile(formDTO.getDutyMobile());
+        originalEntity.setUnifiedSocialCreditCode(formDTO.getUnifiedSocialCreditCode());
+        originalEntity.setUnifiedSocialCreditCodeCertificate(formDTO.getUnifiedSocialCreditCodeCertificate());
+        originalEntity.setFullAddress(formDTO.getFullAddress());
         //利用mybatis 拦截器填充值
         originalEntity.setUpdatedTime(null);
         originalEntity.setUpdatedBy(null);