Merge branch 'develop_master' into develop_migration

2021-08-24 17:31:22 +08:00
parent 02a8b6c969 65a7e634d4
commit 590165a3c8
13 changed files with 67 additions and 16 deletions
@@ -249,6 +249,10 @@
        )
    </select>
    <select id="getAllStands" resultType="java.lang.String">
-        SELECT DISTINCT ID FROM sar_standards_info
+        SELECT DISTINCT STAND_ID FROM sar_stand_items
+    </select>
+
+    <select id="getAllStand" resultType="java.lang.String">
+        SELECT DISTINCT ID FROM sar_standards_info where VALID_FLAG=0
    </select>
 </mapper>