Skip to content

api create employee

Lã Minh Đức requested to merge dev into main

Conflicts:

src/entities/land/region.entity.ts

src/entities/land/task.entity.ts

src/entities/task/task.entity.ts

src/land/controllers/coordinate.controller.ts

src/land/controllers/land.controller.ts

src/land/dto/area.dto.ts

src/land/dto/create-area.dto.ts

src/land/dto/create-coordinate.dto.ts

src/land/dto/create-region.dto.ts

src/land/dto/update-land.dto.ts

src/land/land.module.ts

src/land/services/area.service.ts

src/land/services/asset.service.ts

src/land/services/coordinate.service.ts

src/land/services/employee.service.ts

src/land/services/land.service.ts

src/land/services/owner.service.ts

src/land/services/region.service.ts

src/task/dto/CreateTask.dto.ts

src/task/dto/updateTask.dto.ts

src/task/task.service.ts

Conflicts:

src/entities/task/task.entity.ts

src/entities/task/taskTypemanagement.entity.ts

src/task/dto/CreateTask.dto.ts

Merge request reports