Merge branch 'develop' into dev

* develop:
  fix bug: report time record (rollback code group)

src/controllers/OrganizationDotnetController.ts

@@ -6174,7 +6174,7 @@ export class OrganizationDotnetController extends Controller {
     // group by ancestorDNA แล้วเลือก create_at ล่าสุด
     const grouped = new Map<string, PosMasterHistory>();
     for (const item of profile) {
-      const key = `${item.profileId}`;
+      const key = `${item.ancestorDNA}`;
       if (!grouped.has(key)) {
         grouped.set(key, item);
       } else {