fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -624,17 +624,14 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
         addBo.setTrainStartTime(vo.getTrainStartTime());
         addBo.setTrainEndTime(vo.getTrainEndTime());
         addBo.setChapterStr(ArrayUtils.toString(vo.getChapterList(), ","));
-<<<<<<< HEAD
         addBo.setMoreCertificateStatus(goodsVo.getMoreCertificateStatus());
         addBo.setModuleId(moduleId);
         addBo.setPublicClassHours(goodsVo.getPublicClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP ));
-=======
         if(Validator.isEmpty(goodsVo.getPublicClassHours())){
             addBo.setPublicClassHours(BigDecimal.ZERO);
         }else{
             addBo.setPublicClassHours(goodsVo.getPublicClassHours().setScale( 0, BigDecimal.ROUND_HALF_UP ));
         }
->>>>>>> zs09
         return addBo;
     }
     private String getCertificateCode(){
@@ -976,13 +973,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             if("必修".equals(entity.getMajor())){
                 g.drawString(entity.getMajor(), 768, 718);
             }else{
-<<<<<<< HEAD
-                g.drawString("选修("+entity.getMajor()+")", 677, 718);
-=======
                 g.setFont(font3);
                 g.drawString("选修("+entity.getMajor()+")", 675, 718);
                 g.setFont(font);
->>>>>>> zs09
             }
 
 
@@ -1078,14 +1071,9 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             if("必修".equals(entity.getMajor())){
                 g.drawString(entity.getMajor(), 768, 718);
             }else{
-<<<<<<< HEAD
-                g.drawString("选修("+entity.getMajor()+")", 677, 718);
-=======
                 g.setFont(font3);
                 g.drawString("选修("+entity.getMajor()+")", 675, 718);
                 g.setFont(font);
-
->>>>>>> zs09
             }
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserCertificateVo.java

@@ -129,11 +129,9 @@ public class UserCertificateVo {
 	@ApiModelProperty("专业")
 	private String major;
 
-<<<<<<< HEAD
-=======
+
 	private String tenantId;
 
 	@ApiModelProperty("专业类型")
 	private String majorType;
->>>>>>> zs09
 }