Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _var/_Main/ModelSettings/Common/Dev-21/_ROOT_Role_Dev-21.properties

@@ -4,7 +4,7 @@
_meta.type=model
_meta.version.config=1.3
_self.configsettype=Role
_self.name=Development
_self.name=Dev-21
arg=template:serverargs
arg.architectdependencies=
arg.custom=""
@@ -501,7 +501,7 @@
domainmodel.mdsstoragedefinitionmanager=template:domainmodel.mdsstoragedefinitionmanager
domainmodel.mdsstoragedefinitionmanager.audittrailenabled=false
domainmodel.mdsstoragedefinitionmanager.audittraillocation=
domainmodel.mdsstoragedefinitionmanager.databaseenabled=false
domainmodel.mdsstoragedefinitionmanager.databaseenabled=true
domainmodel.mdsstoragedefinitionmanager.datasetstoredatasource=MacroPlanner
domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=false
domainmodel.mdsstoragedefinitionmanager.datasetstoreislocal=false