Skip to content

fix

Lưu Minh Quân requested to merge quan into main

Conflicts:

src/entities/land/area.entity.ts

src/entities/land/asset.entity.ts

src/entities/land/coordinate.entity.ts

src/entities/land/employee.entity.ts

src/entities/land/region.entity.ts

src/entities/task/task.entity.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

Merge request reports