Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

@@ -150,5 +150,5 @@ public class JgUseRegistrationManageDto extends BaseDto {
     private String useUnitSeq;
 
     @ApiModelProperty("证书是否打印标记")
-    private JSONObject certificatePrintTag;
+    private String certificatePrintTag;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

@@ -33,10 +33,10 @@
             tjurm.manage_type                                                   AS manageType,
             tjurm.car_number                                                    AS carNumber,
             tjurm.is_scrap                                                      AS isScrap,
+            tjurm.certificate_print_tag                                         AS certificatePrintTag,
             tjurm.supervise_org_name
     </sql>
 
-
     <select id="queryByUseUnitCreditCode" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
         <include refid="page_list"/>
         from tzs_jg_use_registration_manage tjurm