From 99ea8b4fc0d7fdd866797b33c7ce773730d42afa Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 11 六月 2024 15:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
index 53bc971..6b1c16a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java
@@ -116,7 +116,7 @@
     @GetMapping("test1")
     public BaseResponse<BaUser> test1(){
         BaUser po = new BaUser() ;
-        po.userId = System.currentTimeMillis() ;
+        po.id = System.currentTimeMillis() ;
         po.userName = "寮犱笁" ;
         po.phone = "13912345678" ;
 

--
Gitblit v1.8.0