• đinh thị đầm's avatar
    Merge branch 'dinhdam' · 6f855afc
    đinh thị đầm authored
    # Conflicts:
    #	src/main/java/com/itsol/quantrivanphong/access/homepage/business/CatalogiBusiness.java
    #	src/main/java/com/itsol/quantrivanphong/access/homepage/business/NewsBusiness.java
    #	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/CatalogiController.java
    #	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussiness.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussinessImpl.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/project/controller/ProjectController.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussiness.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussinessImpl.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/EmployeeRepositoryImpl.java
    #	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/controller/ProjectGroupController.java
    #	src/main/java/com/itsol/quantrivanphong/model/Catalogi.java
    #	src/main/java/com/itsol/quantrivanphong/model/Eproject.java
    #	src/main/java/com/itsol/quantrivanphong/model/News.java
    #	src/main/java/com/itsol/quantrivanphong/report/issue/common/AbstractEntityManagerDao.java
    #	src/main/java/com/itsol/quantrivanphong/report/issue/common/GennericeEntityManagerDao.java
    #	src/main/java/com/itsol/quantrivanphong/report/leaveform/business/LeaveFormBusiness.java
    #	src/main/java/com/itsol/quantrivanphong/report/leaveform/controller/LeaveFormController.java
    #	src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java
    #	src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java
    #	src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java
    #	src/main/resources/public/layout/layout1.html
    #	src/main/resources/public/pages/report/employeeListViews.html
    #	src/main/resources/public/pages/report/employeeListViews1.html
    #	src/main/resources/public/pages/report/reportController.js
    #	src/main/resources/public/pages/report/reportPage.html
    6f855afc
app.js 13.6 KB