Merge remote-tracking branch 'origin/master'

src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardUserVO.java

@@ -34,6 +34,16 @@ public class DistributionCardUserVO {
     private String unitName;
     //@ApiModelProperty(name = "classPlanName", value = "班级名称")
     private String classPlanName;
+    //@ApiModelProperty(name = "classPlanName", value = "考试地址")
+    private String address;
+
+    public String getAddress() {
+        return address == null ? "" : address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
 
     public String getClassPlanName() {
         return classPlanName == null ? "" : classPlanName;

src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java

@@ -128,6 +128,7 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I
                 InstitutionDTO institutionDTO1 = iInstitutionService.get(userList.get(j-1).getApplyInstitutionId());
                 userVO.setUnitName(institutionDTO1.getInstitutionName());
                 userVO.setClassPlanName(userList.get(j-1).getApplyClassName());
+                userVO.setAddress(institutionDTO.getInstitutionAddress());
                 String base64 = iPicturesTemplateBuildingService.buildingPictures("TS0001", userVO);
                 if(base64 == null) {
                     throw new SaveException("生成准考证出错");