wuzhen提交本地修改
This commit is contained in:
1 parent
eeb79de050
commit
b15a4abad9
4 files changed
+18
-3
No files matched your search
@@ -1,3 +1,4 @@
|
||||
<<<<<<< Updated upstream
|
||||
org.dromara.system.domain.vo.SysNoticeVo
|
||||
org.dromara.system.domain.bo.SysDictDataBo
|
||||
org.dromara.system.domain.bo.SysNoticeBo
|
||||
@@ -65,4 +66,12 @@ org.dromara.hq.domain.bo.HqSatSurveyQuestionBo
|
||||
org.dromara.system.domain.vo.SysDictDataVo
|
||||
org.dromara.hq.domain.bo.HqVenueReservationBo
|
||||
org.dromara.system.domain.bo.SysRoleBo
|
||||
org.dromara.system.domain.vo.SysPostVo
|
||||
org.dromara.system.domain.vo.SysPostVo
|
||||
=======
|
||||
org.dromara.workflow.domain.vo.FlowCategoryVo
|
||||
org.dromara.workflow.domain.vo.TestLeaveVo
|
||||
org.dromara.workflow.domain.bo.TestLeaveBo
|
||||
org.dromara.xg.domain.bo.XgStudentInfoBo
|
||||
org.dromara.xg.domain.vo.XgStudentInfoVo
|
||||
org.dromara.workflow.domain.bo.FlowCategoryBo
|
||||
>>>>>>> Stashed changes
|
||||
Reference in new issue
Block a user