Merge branch 'master' of http://10.10.28.13:8080/r/PDM/PdmSwPlugin2

chr

2024-08-21 9ee7d3bd9c58a204b1efe38e6be61155bbb15c16

 PdmSwPlugin.PropertySetting/Panel/JgjModulePanel.xaml

@@ -19,7 +19,7 @@
    <StackPanel>
        <StackPanel x:Name="materialCodePanel">
            <Label Content="物料编码"/>
            <TextBox  x:Name="materialCodeText" Text="{Binding materialCode,UpdateSourceTrigger=PropertyChanged}"/>
            <TextBox x:Name="materialCodeText" IsReadOnly="True" Text="{Binding materialCode,UpdateSourceTrigger=PropertyChanged}"/>
        </StackPanel>

        <StackPanel x:Name="materialNamePanel">