You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
95 lines
6.8 KiB
Plaintext
95 lines
6.8 KiB
Plaintext
|
|
|
|
<<<<<<< HEAD
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormBoard.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormChargingBoard.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormLocator.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormOutBoxBoard.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\FormShowSelect.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\FormItem\Main.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\ordertj.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\orderzfzy.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\orderzy.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_order.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_ordertj.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_orderzfzy.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\product_orderzy.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCArea.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCBoard.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCCar.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCCarL.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCLMix.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCMix.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCMixR.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCPermissionList.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCPostionList.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCProgressBar.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCRoleList.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCRProgressBar.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCStorage.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCStorageNew.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCStorageNewx.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCTakeOff.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\UControl\UCUserList.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Complete.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_DeviceItems.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Flow.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Index.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_InOut.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Material.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_NowUser.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Paused.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_Prepare.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_User.xaml;;
|
|
FE:\workspace\LanJu\client\shangjian\XGL\Views\LanJu_UserRecord.xaml;;
|
|
=======
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBlankingBoard.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormBoard.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormChargingBoard.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormLocator.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormOutBoxBoard.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\FormShowSelect.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\FormItem\Main.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Tools\ModuleUC.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\ordertj.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzfzy.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\orderzy.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_order.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_ordertj.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzfzy.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\product_orderzy.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCArea.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCBoard.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCar.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCCarL.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCLMix.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMix.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCMixR.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPermissionList.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCPostionList.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCProgressBar.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRoleList.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCRProgressBar.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorage.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNew.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCStorageNewx.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCTakeOff.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\UControl\UCUserList.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\CheckUserWin.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\DryingRoomUC.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Complete.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_DeviceItems.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Flow.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Index.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_InOut.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Material.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_NowUser.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Operator.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Paused.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_Prepare.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_User.xaml;;
|
|
FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\XGL\Views\LanJu_UserRecord.xaml;;
|
|
>>>>>>> babf7ea9e37642c626439584d080cf06049abc5f
|
|
|