cykj/hzdyjs
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve: 解决合并冲突

Browse Source
This commit is contained in:
wuzhen committed 2025-07-10 18:02:35 +08:00
2 parents 661a513f57 3f9838e8f1
commit 80dface225
97 files changed
+4789 -1686
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

target/classes/META-INF/mps/autoMapper
+10 -6
View File
@@ -3,25 +3,30 @@ org.dromara.system.domain.vo.SysNoticeVo
org.dromara.system.domain.bo.SysDictDataBo
org.dromara.system.domain.bo.SysNoticeBo
org.dromara.xg.domain.vo.XgAuditRecordVo
org.dromara.hq.domain.vo.HqPmRepairOrderVo
org.dromara.system.domain.vo.SysClientVo
org.dromara.hq.domain.vo.HqSatSurveyQuestionVo
org.dromara.system.domain.vo.SysConfigVo
org.dromara.hq.domain.bo.HqPmRepairAttachmentBo
org.dromara.hq.domain.bo.HqHallInfoBo
org.dromara.system.domain.vo.SysDeptVo
org.dromara.hq.domain.bo.HqSatSurveyBo
org.dromara.hq.domain.bo.PmRepairOrderBo
org.dromara.system.domain.bo.SysDictTypeBo
org.dromara.system.domain.bo.SysDeptBo
org.dromara.system.domain.vo.SysOssConfigVo
org.dromara.hq.domain.vo.HqSatSurveyVo
org.dromara.hq.domain.vo.HqSatRecordVo
org.dromara.hq.domain.bo.HqHallReservationBo
org.dromara.hq.domain.bo.HqPmServiceEvaluationBo
org.dromara.hq.domain.bo.HqSatRecordBo
org.dromara.system.domain.bo.SysSocialBo
org.dromara.system.domain.bo.SysTenantPackageBo
org.dromara.test.domain.vo.XgStuMsgVo
org.dromara.system.domain.vo.SysDictTypeVo
org.dromara.hq.domain.bo.HqSatQuestionBo
org.dromara.hq.domain.bo.HqPmRepairProgressBo
org.dromara.hq.domain.bo.HqPmRepairOrderBo
org.dromara.hq.domain.vo.HqPmRepairAttachmentVo
org.dromara.system.domain.vo.SysTenantPackageVo
org.dromara.system.domain.vo.SysSocialVo
org.dromara.hq.domain.bo.HqSatCategoryBo
@@ -35,8 +40,9 @@ org.dromara.hq.domain.vo.HqHallInfoVo
org.dromara.system.domain.bo.SysConfigBo
org.dromara.web.domain.vo.TenantListVo
org.dromara.system.domain.bo.SysLogininforBo
org.dromara.hq.domain.bo.PmRepairCategoryBo
org.dromara.hq.domain.vo.HqPmRepairProgressVo
org.dromara.xg.domain.vo.XgStudentInfoVo
org.dromara.hq.domain.vo.HqPmRepairCategoryVo
org.dromara.hq.domain.bo.HqSatOptionBo
org.dromara.system.domain.bo.SysOssBo
org.dromara.system.domain.vo.SysMenuVo
@@ -44,27 +50,25 @@ org.dromara.hq.domain.vo.HqSatCategoryVo
org.dromara.system.domain.vo.SysUserVo
org.dromara.hq.domain.vo.HqVenueInfoVo
org.dromara.xg.domain.vo.XgClassStudentVo
org.dromara.hq.domain.vo.PmRepairCategoryVo
org.dromara.system.domain.bo.SysTenantBo
org.dromara.hq.domain.vo.PmRepairAttachmentVo
org.dromara.system.domain.bo.SysOssConfigBo
org.dromara.system.domain.bo.SysMenuBo
org.dromara.hq.domain.vo.HqVenueReservationVo
org.dromara.system.domain.vo.SysOperLogVo
org.dromara.system.domain.vo.SysLogininforVo
org.dromara.hq.domain.vo.PmRepairOrderVo
org.dromara.hq.domain.bo.HqSatDetailBo
org.dromara.test.domain.bo.XgStuMsgBo
org.dromara.hq.domain.bo.HqVenueInfoBo
org.dromara.system.domain.bo.SysUserBo
org.dromara.system.domain.vo.SysOssVo
org.dromara.hq.domain.bo.HqPmRepairCategoryBo
org.dromara.hq.domain.vo.HqSatOptionVo
org.dromara.hq.domain.vo.HqHallReservationVo
org.dromara.hq.domain.vo.HqPmServiceEvaluationVo
org.dromara.system.domain.vo.SysTenantVo
org.dromara.hq.domain.vo.HqSatQuestionVo
org.dromara.hq.domain.bo.HqSatSurveyQuestionBo
org.dromara.system.domain.vo.SysDictDataVo
org.dromara.hq.domain.bo.PmRepairAttachmentBo
org.dromara.xg.domain.bo.XgClassInfoBo
org.dromara.hq.domain.bo.HqVenueReservationBo
org.dromara.system.domain.bo.SysRoleBo
target/classes/META-INF/mps/mappers
+28 -75
View File
@@ -1,112 +1,65 @@
org.dromara.system.domain.vo.SysSocialVoToSysSocialMapper
org.dromara.system.domain.vo.SysDictDataVoToSysDictDataMapper
org.dromara.hq.domain.HqSatDetailToHqSatDetailVoMapper
org.dromara.xg.domain.vo.XgCollectionBatchVoToXgCollectionBatchMapper
org.dromara.hq.domain.HqSatSurveyQuestionToHqSatSurveyQuestionVoMapper
org.dromara.system.domain.SysOssConfigToSysOssConfigVoMapper
org.dromara.system.domain.vo.SysLogininforVoToSysLogininforMapper
org.dromara.system.domain.bo.SysConfigBoToSysConfigMapper
org.dromara.hq.domain.bo.HqSatSurveyBoToHqSatSurveyMapper
org.dromara.system.domain.SysTenantPackageToSysTenantPackageVoMapper
org.dromara.system.domain.bo.SysPostBoToSysPostMapper
org.dromara.system.domain.vo.SysOssConfigVoToSysOssConfigMapper
org.dromara.system.domain.SysDictDataToSysDictDataVoMapper
org.dromara.hq.domain.bo.HqSatRecordBoToHqSatRecordMapper
org.dromara.system.domain.vo.SysRoleVoToSysRoleMapper
org.dromara.hq.domain.bo.HqHallReservationBoToHqHallReservationMapper
org.dromara.system.domain.vo.SysClientVoToSysClientMapper
org.dromara.system.domain.bo.SysOssConfigBoToSysOssConfigMapper
org.dromara.system.domain.bo.SysDeptBoToSysDeptMapper
org.dromara.hq.domain.vo.PmRepairAttachmentVoToPmRepairAttachmentMapper
org.dromara.hq.domain.HqSatCategoryToHqSatCategoryVoMapper
org.dromara.hq.domain.bo.HqSatDetailBoToHqSatDetailMapper
org.dromara.system.domain.bo.SysOssBoToSysOssMapper
org.dromara.system.domain.vo.SysMenuVoToSysMenuMapper
org.dromara.hq.domain.vo.HqHallInfoVoToHqHallInfoMapper
org.dromara.hq.domain.bo.HqHallInfoBoToHqHallInfoMapper
org.dromara.xg.domain.XgAuditRecordToXgAuditRecordVoMapper
org.dromara.xg.domain.XgStudentInfoToXgStudentInfoVoMapper
org.dromara.hq.domain.bo.HqVenueReservationBoToHqVenueReservationMapper
org.dromara.hq.domain.vo.PmRepairOrderVoToPmRepairOrderMapper
org.dromara.system.domain.bo.SysClientBoToSysClientMapper
org.dromara.system.domain.SysClientToSysClientVoMapper
org.dromara.hq.domain.HqVenueReservationToHqVenueReservationVoMapper
org.dromara.hq.domain.vo.HqSatCategoryVoToHqSatCategoryMapper
org.dromara.test.domain.XgStuMsgToXgStuMsgVoMapper
org.dromara.hq.domain.vo.HqSatRecordVoToHqSatRecordMapper
org.dromara.system.domain.SysTenantToSysTenantVoMapper
org.dromara.hq.domain.vo.HqHallReservationVoToHqHallReservationMapper
org.dromara.system.domain.vo.SysConfigVoToSysConfigMapper
org.dromara.xg.domain.vo.XgClassInfoVoToXgClassInfoMapper
org.dromara.system.domain.bo.SysSocialBoToSysSocialMapper
org.dromara.xg.domain.vo.XgStudentInfoVoToXgStudentInfoMapper
org.dromara.system.domain.vo.SysOssVoToSysOssMapper
org.dromara.system.domain.SysDictTypeToSysDictTypeVoMapper
org.dromara.hq.domain.HqHallReservationToHqHallReservationVoMapper
org.dromara.hq.domain.vo.HqVenueInfoVoToHqVenueInfoMapper
org.dromara.hq.domain.vo.HqSatOptionVoToHqSatOptionMapper
org.dromara.xg.domain.XgClassStudentToXgClassStudentVoMapper
org.dromara.hq.domain.bo.HqVenueInfoBoToHqVenueInfoMapper
org.dromara.hq.domain.bo.HqSatOptionBoToHqSatOptionMapper
org.dromara.hq.domain.bo.HqSatCategoryBoToHqSatCategoryMapper
org.dromara.system.domain.SysLogininforToSysLogininforVoMapper
org.dromara.web.domain.vo.TenantListVoToSysTenantVoMapper
org.dromara.system.domain.vo.SysPostVoToSysPostMapper
org.dromara.system.domain.SysSocialToSysSocialVoMapper
org.dromara.system.domain.bo.SysDictTypeBoToSysDictTypeMapper
org.dromara.common.log.event.OperLogEventToSysOperLogBoMapper
org.dromara.xg.domain.bo.XgStudentInfoBoToXgStudentInfoMapper
org.dromara.system.domain.bo.SysNoticeBoToSysNoticeMapper
org.dromara.system.domain.vo.SysSocialVoToSysSocialMapper
org.dromara.hq.domain.bo.HqSatSurveyQuestionBoToHqSatSurveyQuestionMapper
org.dromara.system.domain.SysOssConfigToSysOssConfigVoMapper
org.dromara.hq.domain.vo.HqSatSurveyQuestionVoToHqSatSurveyQuestionMapper
org.dromara.system.domain.SysUserToSysUserVoMapper
org.dromara.system.domain.vo.SysDictTypeVoToSysDictTypeMapper
org.dromara.test.domain.vo.XgStuMsgVoToXgStuMsgMapper
org.dromara.system.domain.SysDictDataToSysDictDataVoMapper
org.dromara.system.domain.bo.SysMenuBoToSysMenuMapper
org.dromara.hq.domain.HqVenueInfoToHqVenueInfoVoMapper
org.dromara.system.domain.vo.SysTenantVoToTenantListVoMapper
org.dromara.hq.domain.HqHallInfoToHqHallInfoVoMapper
org.dromara.system.domain.vo.SysRoleVoToSysRoleMapper
org.dromara.system.domain.vo.SysClientVoToSysClientMapper
org.dromara.system.domain.bo.SysOssConfigBoToSysOssConfigMapper
org.dromara.system.domain.SysConfigToSysConfigVoMapper
org.dromara.system.domain.bo.SysOperLogBoToOperLogEventMapper
org.dromara.hq.domain.PmRepairAttachmentToPmRepairAttachmentVoMapper
org.dromara.hq.domain.bo.PmRepairAttachmentBoToPmRepairAttachmentMapper
org.dromara.hq.domain.HqSatSurveyToHqSatSurveyVoMapper
org.dromara.hq.domain.vo.HqSatDetailVoToHqSatDetailMapper
org.dromara.system.domain.bo.SysDeptBoToSysDeptMapper
org.dromara.system.domain.vo.SysNoticeVoToSysNoticeMapper
org.dromara.hq.domain.bo.PmRepairOrderBoToPmRepairOrderMapper
org.dromara.hq.domain.HqSatQuestionToHqSatQuestionVoMapper
org.dromara.xg.domain.bo.XgClassInfoBoToXgClassInfoMapper
org.dromara.hq.domain.vo.HqVenueReservationVoToHqVenueReservationMapper
org.dromara.system.domain.bo.SysOssBoToSysOssMapper
org.dromara.xg.domain.vo.XgClassStudentVoToXgClassStudentMapper
org.dromara.system.domain.vo.SysMenuVoToSysMenuMapper
org.dromara.system.domain.SysMenuToSysMenuVoMapper
org.dromara.system.domain.vo.SysTenantVoToSysTenantMapper
org.dromara.system.domain.bo.SysUserBoToSysUserMapper
org.dromara.xg.domain.XgAuditRecordToXgAuditRecordVoMapper
org.dromara.xg.domain.XgStudentInfoToXgStudentInfoVoMapper
org.dromara.xg.domain.XgClassInfoToXgClassInfoVoMapper
org.dromara.system.domain.bo.SysClientBoToSysClientMapper
org.dromara.system.domain.bo.SysDictDataBoToSysDictDataMapper
org.dromara.hq.domain.vo.HqSatSurveyVoToHqSatSurveyMapper
org.dromara.system.domain.SysClientToSysClientVoMapper
org.dromara.system.domain.vo.SysUserVoToSysUserMapper
org.dromara.system.domain.SysNoticeToSysNoticeVoMapper
org.dromara.system.domain.SysOssToSysOssVoMapper
org.dromara.system.domain.SysOperLogToSysOperLogVoMapper
org.dromara.system.domain.bo.SysLogininforBoToSysLogininforMapper
org.dromara.system.domain.SysTenantToSysTenantVoMapper
org.dromara.system.domain.vo.SysDeptVoToSysDeptMapper
org.dromara.hq.domain.PmRepairCategoryToPmRepairCategoryVoMapper
org.dromara.hq.domain.bo.PmRepairCategoryBoToPmRepairCategoryMapper
org.dromara.hq.domain.PmRepairOrderToPmRepairOrderVoMapper
org.dromara.hq.domain.HqSatOptionToHqSatOptionVoMapper
org.dromara.hq.domain.vo.PmRepairCategoryVoToPmRepairCategoryMapper
org.dromara.system.domain.vo.SysConfigVoToSysConfigMapper
org.dromara.xg.domain.vo.XgClassInfoVoToXgClassInfoMapper
org.dromara.system.domain.bo.SysSocialBoToSysSocialMapper
org.dromara.system.domain.bo.SysRoleBoToSysRoleMapper
org.dromara.hq.domain.bo.HqSatQuestionBoToHqSatQuestionMapper
org.dromara.hq.domain.HqSatRecordToHqSatRecordVoMapper
org.dromara.xg.domain.vo.XgStudentInfoVoToXgStudentInfoMapper
org.dromara.system.domain.vo.SysOssVoToSysOssMapper
org.dromara.system.domain.SysDictTypeToSysDictTypeVoMapper
org.dromara.system.domain.SysRoleToSysRoleVoMapper
org.dromara.hq.domain.vo.HqSatQuestionVoToHqSatQuestionMapper
org.dromara.system.domain.vo.SysTenantPackageVoToSysTenantPackageMapper
org.dromara.xg.domain.XgClassStudentToXgClassStudentVoMapper
org.dromara.system.domain.bo.SysTenantBoToSysTenantMapper
org.dromara.system.domain.bo.SysTenantPackageBoToSysTenantPackageMapper
org.dromara.test.domain.bo.XgStuMsgBoToXgStuMsgMapper
org.dromara.system.domain.SysLogininforToSysLogininforVoMapper
org.dromara.system.domain.vo.SysPostVoToSysPostMapper
org.dromara.system.domain.SysSocialToSysSocialVoMapper
org.dromara.system.domain.bo.SysDictTypeBoToSysDictTypeMapper
org.dromara.common.log.event.OperLogEventToSysOperLogBoMapper
org.dromara.xg.domain.bo.XgStudentInfoBoToXgStudentInfoMapper
org.dromara.system.domain.bo.SysOperLogBoToSysOperLogMapper
org.dromara.xg.domain.vo.XgAuditRecordVoToXgAuditRecordMapper
org.dromara.system.domain.vo.SysOperLogVoToSysOperLogMapper
org.dromara.system.domain.SysDeptToSysDeptVoMapper
org.dromara.system.domain.bo.SysNoticeBoToSysNoticeMapper
org.dromara.xg.domain.XgCollectionBatchToXgCollectionBatchVoMapper
org.dromara.system.domain.SysPostToSysPostVoMapper