From 358df159bfc32619825561a4ff245ae5804d6f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 6 Dec 2022 18:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/sale/admin/controller/auth/RegisterController.java | 2 +-
 .../glxp/sale/admin/controller/inout/WareHouseController.java   | 2 +-
 .../src/main/resources/mybatis/mapper/inout/StockOrderDao.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java
index 99ce454..942bc11 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java
@@ -133,7 +133,7 @@ public class RegisterController {
             json.put("createTime", System.currentTimeMillis());
             //验证码存入redis中
             redisUtil.set(Constant.CAPTCHAS + checkCodeRequest.getPhoneNum(), json, 300L);
-            return ResultVOUtils.success("发送成功" + "   " + mobile_code);
+            return ResultVOUtils.success("发送成功");
         } else {
             return ResultVOUtils.error(500, "验证码发送失败");
         }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index b8a5da0..7415205 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -839,7 +839,7 @@ public class WareHouseController {
                     if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
                         actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
                     } else {
-                        actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl();
+                        actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
                     }
                 } else {
                     actCount = udiRelevanceResponse.getBhzxxsbzsl();
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
index 702f9bb..31194e0 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -221,7 +221,7 @@
             </if>
         </where>
         group by stock_order.id
-        ORDER BY id DESC
+        ORDER BY stock_order.updateTime DESC,id DESC
 
     </select>