science-admin/src/main/java/com/yiboshi/science/rest/v1 · 10b7729b52daf0edac752e0b74544640a994c184 · 徐俊 / yn-health-science

Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science · 10b7729b

徐俊 authored 1 month ago

# Conflicts:
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
#	science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml

10b7729b

Name	Last commit	Last update
..
AuthorizationController.java	77	6 months ago
ComBatchController.java	xujun	2 months ago
ComConclusionCatalogController.java	init project code	6 months ago
ComConclusionFundsController.java	init project code	6 months ago
ComConclusionResearchersController.java	init project code	6 months ago
ComConclusionThesisController.java	77	6 months ago
ComDownloadController.java	xujun	3 months ago
ComEvaluationContentController.java	77	6 months ago
ComEvaluationController.java	77	6 months ago
ComEvaluationItemController.java	init project code	6 months ago
ComEvaluationItemNoteController.java	init project code	6 months ago
ComEvaluationNoteController.java	init project code	6 months ago
ComEvaluationStandardController.java	init project code	6 months ago
ComEvaluationValueController.java	77	6 months ago
ComExpertBatchController.java	init project code	6 months ago
ComExpertController.java	1	5 months ago
ComExpertGroupAssignController.java	init project code	6 months ago
ComExpertGroupController.java	77	6 months ago
ComExpertGroupMembersController.java	init project code	6 months ago
ComExpertSpecController.java	1	3 months ago
ComFileController.java	init project code	6 months ago
ComManagerController.java	77	6 months ago
ComNoticeController.java	77	6 months ago
ComPersonController.java	xujun	3 months ago
ComProjectAssignController.java	77	5 months ago
ComProjectAuditController.java		Loading commit data...
ComProjectAuditNoteController.java		Loading commit data...
ComProjectBasicController.java		Loading commit data...
ComProjectBudgetController.java		Loading commit data...
ComProjectCheckController.java		Loading commit data...
ComProjectConclusionController.java		Loading commit data...
ComProjectConclusionMaterialController.java		Loading commit data...
ComProjectController.java		Loading commit data...
ComProjectCooperativeUnitsController.java		Loading commit data...
ComProjectEquipmentController.java		Loading commit data...
ComProjectFundCompositionController.java		Loading commit data...
ComProjectFundPlanController.java		Loading commit data...
ComProjectGroupAssignController.java		Loading commit data...
ComProjectGroupController.java		Loading commit data...
ComProjectGroupDetailController.java		Loading commit data...
ComProjectKpitController.java		Loading commit data...
ComProjectManagementRuleController.java		Loading commit data...
ComProjectMembersController.java		Loading commit data...
ComProjectResearchController.java		Loading commit data...
ComProjectResultsController.java		Loading commit data...
ComProjectStageGoalController.java		Loading commit data...
ComProjectSubController.java		Loading commit data...
ComProjectTaskController.java		Loading commit data...
ComProjectUnitPaymentController.java		Loading commit data...
ComSendingRecordController.java		Loading commit data...
ComTalentApplyController.java		Loading commit data...
ComTaskTargetController.java		Loading commit data...
ComUnitController.java		Loading commit data...
LogsExceptionController.java		Loading commit data...
LogsLoginController.java		Loading commit data...
LogsOperationController.java		Loading commit data...
LogsRequestExceptionController.java		Loading commit data...
StatisticalController.java		Loading commit data...
SystemMenuController.java		Loading commit data...
SystemMenuRoleController.java		Loading commit data...
SystemParameterController.java		Loading commit data...
SystemParameterTypeController.java		Loading commit data...
SystemRoleController.java		Loading commit data...
SystemSetController.java		Loading commit data...
SystemUserController.java		Loading commit data...
SystemUserRoleController.java		Loading commit data...