Merge branch 'dev' into 7641-refactorEntryReport

2024-11-14 15:22:00 +00:00 · 2024-11-14 15:22:00 +00:00 · 1ca737fd13
parent ab2e88806e e242320eed
commit 1ca737fd13
2 changed files with 3 additions and 1 deletions
--- a/db/versions/11348-bronzeCamellia/00-firstScript.sql
+++ b/db/versions/11348-bronzeCamellia/00-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.clientObservation MODIFY COLUMN observationTypeFk tinyint(3) unsigned DEFAULT 4 NOT NULL;
+UPDATE vn.clientObservation SET observationTypeFk=4 WHERE observationTypeFk=0;
--- a/modules/client/back/models/client-observation.json
+++ b/modules/client/back/models/client-observation.json
@ -55,7 +55,7 @@
 					"relation": "user",
 					"scope": {
 						"fields": [
-							"nickname"
+							"name"
 						]
 					}
 				}