Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -28,6 +28,7 @@
             isn.notice_report_url AS noticeReportUrl,
             isn.create_user_id as createUserId,
             isn.next_task_id AS nextTaskId,
+            isn.org_branch_name as orgBranchName,
             isn.next_execute_user_ids as nextExecuteUserIds,
             (SELECT name from tz_equipment_category  where  code = isn.equ_list_code) AS equListName,
             (SELECT name from tz_equipment_category  where  code = isn.equ_category_code) AS equList,

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

@@ -102,7 +102,8 @@
                date_format(tjvi.create_date,'%Y-%m-%d')  as createDate,
                tjvi.cancel_reason as cancelReason,
                tjvi.reg_type        as regType,
-               tjvi.org_branch_code as orgBranchCode
+               tjvi.org_branch_code as orgBranchCode,
+               tjvi.org_branch_name as orgBranchName
         from tzs_jg_vehicle_information tjvi
     </sql>