SL 426cb43828 Merge branch 'develop' into feature/single-session-login ... # Conflicts: # MECF.Framework.RT.EquipmentLibrary/Devices/TcAds.cs		2023-09-22 08:51:21 +08:00
..
Caliburn.Micro	准备优化Role权限保存方式，从字符串方式更改为XmlElement节点方式保存每一条权限。	2023-09-05 00:12:08 +08:00
CenterViews	Merge branch 'develop' into feature/single-session-login	2023-09-22 08:51:21 +08:00
ClientBase	[Common]	2023-09-21 11:41:43 +08:00
Core/Container	Add project files.	2023-04-13 11:51:03 +08:00
Ctrlib	[UI.Core]	2023-08-14 17:45:47 +08:00
DataGridTransform	[UI.Client]	2023-06-19 17:54:15 +08:00
IndustrialControl	Add project files.	2023-04-13 11:51:03 +08:00
Properties	[Common]	2023-05-12 18:17:49 +08:00
RecipeEditorLib	[Common]	2023-09-21 11:41:43 +08:00
Resources/Images	从8号机移植PMProcessView视图及其相关视图，并编译通过。	2023-06-29 11:58:56 +08:00
Themes	[Common]	2023-09-14 14:17:16 +08:00
TrayThickness	[Common]	2023-09-20 17:25:51 +08:00
MECF.Framework.UI.Client.csproj	[Common]	2023-09-20 17:25:51 +08:00
ReleaseNotes.md	[Common]	2023-05-12 18:17:49 +08:00
SicModuleUIViewModelBase.cs	从8号机移植PMProcessView视图及其相关视图，并编译通过。	2023-06-29 11:58:56 +08:00
app.config	Add project files.	2023-04-13 11:51:03 +08:00