Merge remote-tracking branch 'origin/dev' into dev

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/client/ISupplierClient.java

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.module.supplier.vo.LngSupplierVo;
 
 /**
  * @author: ksy
@@ -19,6 +20,6 @@ public interface ISupplierClient {
 	Map<String,String> getAllTranData();
 	
 	@GetMapping("/getTranById")
-	String getTranById(@RequestParam("id")String id);
+	LngSupplierVo getTranById(@RequestParam("id")String id);
 	
 }