From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/resources/mapper/BasArmRulesMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/BasArmRulesMapper.xml b/src/main/resources/mapper/BasArmRulesMapper.xml
index 3f1ee0f..466c927 100644
--- a/src/main/resources/mapper/BasArmRulesMapper.xml
+++ b/src/main/resources/mapper/BasArmRulesMapper.xml
@@ -17,7 +17,7 @@
<select id="AllStatusSatisfyBasArmRules" resultMap="BaseResultMap">
- select top 10 from asr_bas_arm_rules where 1=1 and status = #{status}
+ select top 10 * from asr_bas_arm_rules where 1=1 and status = #{status}
</select>
<update id="updateStatus">
@@ -35,7 +35,6 @@
select material_number
from asr_bas_arm_rules
where 1=1
- and material_volume = #{volume}
and material_length = #{length}
and material_width = #{width}
and material_height = #{height}
--
Gitblit v1.9.1