Merge remote-tracking branch 'origin/main' into multi-tenant

database/upgrade/upg_function.sql

@@ -1,16 +1,17 @@
-DELIMITER / /
+DELIMITER //
 
 CREATE FUNCTION IF NOT EXISTS omc_get_dict_value(field_value VARCHAR(255), type VARCHAR(255))
-RETURNS VARCHAR(255)
+RETURNS VARCHAR(255) CHARSET utf8mb4 COLLATE utf8mb4_general_ci
 DETERMINISTIC
 BEGIN
 DECLARE result VARCHAR(255);
 
 SELECT `dict_value` INTO result
-FROM  `sys_dict_data`
-WHERE `dict_label` = field_value AND `dict_type` = type limit 1;
+FROM `sys_dict_data`
+WHERE `dict_label` = field_value AND `dict_type` = type
+LIMIT 1;
 
 RETURN result;
 END //
 
-DELIMITER;
+DELIMITER ;