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

2021-10-14 14:41:07 +08:00
parent b33d2da29d 371f0cbfe8
commit 2caec798ad
1 changed files with 1 additions and 0 deletions
@@ -732,6 +732,7 @@

    <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq ,read_content as technicalRequir ,compared_with_previous as changePoint
+        ,TERMS_CONDITIONS as termsConditions
        from SAR_STAND_ITEMS
        where FILE_TYPE=#{type}
        <if test="ids != null">