Merge remote-tracking branch 'origin/develop_master' into develop_3

This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-31 21:39:44 +08:00
5 changed files with 84 additions and 41 deletions
@@ -64,7 +64,7 @@
<select id="selectLawsId" resultType="string">
select distinct stand_id from sar_laws_attr_detailed_list
select stand_id from sar_laws_attr_detailed_list
LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
<where>
<if test="standId != null">