From 07968530fd2a7c0d818adc8a89c96a9499dbbee6 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期一, 19 一月 2026 16:17:38 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Properties/PublishProfiles/WTTFolder.pubxml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml similarity index 74% rename from WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml rename to WebAPI/Properties/PublishProfiles/WTTFolder.pubxml index cabad0c..8316d46 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml +++ b/WebAPI/Properties/PublishProfiles/WTTFolder.pubxml @@ -1,4 +1,8 @@ +<<<<<<< HEAD:WebAPI/Properties/PublishProfiles/WTTFolder.pubxml +锘�<?xml version="1.0" encoding="utf-8"?> +======= <?xml version="1.0" encoding="utf-8"?> +>>>>>>> 6367b170a3db4df6e43a8962b2f17b06a020b913:WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml <!-- https://go.microsoft.com/fwlink/?LinkID=208121. --> -- Gitblit v1.9.1