Merge remote-tracking branch 'origin/master'

src/main/resources/database/template/inquiryReply.xml

@@ -18,7 +18,7 @@
                   bi_cop,bi_environment,bi_purpose,'公开询价单','已上传','已审核','AUDITED' from batchinquiry where bi_code=${detail.in_code};
                 end if;
                 -- 明细
-                select max(id_id) into v_id_id from inquirydetail where id_inid=v_in_id and id_vendyyzzh=${detail.id_vendyyzzh}
+                select max(id_id) into v_id_id from inquirydetail where id_inid=v_in_id and id_venduu=${detail.ve_uu}
                 and id_prodcode=${detail.id_prodcode};
                 if v_id_id is null then
                   v_id_id := inquirydetail_seq.nextval;