修复合并bug

This commit is contained in:
chfei committed 2026-08-19 15:46:51 +08:00
1 parent a542e25c11
commit acd07e6854
1 file changed
+2 -1
@@ -49,10 +49,11 @@
<usercontrols:UcWaterMarkTextBox <usercontrols:UcWaterMarkTextBox
x:Name="txtOrderId" x:Name="txtFilterOrderId"
Grid.Column="0" Grid.Column="0"
Height="28" Height="28"
Margin="0,0,8,0" Margin="0,0,8,0"
TextChanged="txtOrderId_TextChanged"
WaterMark="店铺单号" /> WaterMark="店铺单号" />
<usercontrols:UcWaterMarkTextBox <usercontrols:UcWaterMarkTextBox