Merge branch 'master' into develop
This commit is contained in:
@@ -821,8 +821,8 @@ public class ActivityService {
|
||||
" stb_activity.result_description AS 'descr_esito',\n" +
|
||||
" ISNULL(stb_activity.priorita, 0) AS 'priorita',\n" +
|
||||
" stb_activity.activity_type_id AS 'tipo_attivita',\n" +
|
||||
" stb_activity.ora_ins_act AS 'data_inserimento',\n" +
|
||||
"\t\t\t\t\t\t stb_activity.ora_mod_act AS 'ultima_modifica',\n" +
|
||||
" IsNull(stb_activity.ora_ins_act, stb_activity.data_ins_act) AS 'data_inserimento',\n" +
|
||||
" stb_activity.ora_mod_act AS 'ultima_modifica',\n" +
|
||||
" stb_activity.persona_rif AS 'richiedente',\n" +
|
||||
" stb_activity.estimated_enddate,\n" +
|
||||
" stb_activity.cod_mart AS cod_mart,\n" +
|
||||
|
||||
Reference in New Issue
Block a user