From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java index cdcf4df..524c373 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingle.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * 閽堝涓�涓暟鎹簮锛堜腑闂翠欢搴旂敤锛夛紝澶氭暟鎹簮搴旂敤涓疄闄呭彧鐢ㄤ簡涓�涓暟鎹簮 + * 閽堝涓�涓暟鎹簮锛堥�氫俊涓棿浠跺簲鐢級锛屽鏁版嵁婧愬簲鐢ㄤ腑瀹為檯鍙敤浜嗕竴涓暟鎹簮 * 澶氭暟鎹簮搴旂敤涓紝閫氳繃娉ㄨВ纭畾鏌愪釜鏁版嵁婧愩�� * 纭畾鏁版嵁婧愭湁涓ょ鏂规硶锛� * 1銆佹敞瑙f槑纭簡鏁版嵁婧愶細 -- Gitblit v1.8.0