Merge remote-tracking branch 'origin/master'

cl

2024-02-17 7ff5e9edadf446d0d033574a7b0ae802f5ac2233

 jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml

@@ -50,7 +50,16 @@
        <include refid="selectBsFormulaChildInfoVo"/>
        where id = #{id}
    </select>
        

    <select id="getProductProcess" parameterType="com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery" resultMap="BsFormulaChildInfoResult">
        <include refid="selectBsFormulaChildInfoVo"/>
        <where>
            <if test="processesCode != null and processesCode != '' ">and processes_code = #{processesCode}</if>
            <if test="productCode != null and productCode != '' ">and product_code = #{productCode}</if>
        </where>
        order by step_sort
    </select>

    <insert id="insertBsFormulaChildInfo" parameterType="BsFormulaChildInfo" useGeneratedKeys="true" keyProperty="id">
        insert into bs_formula_child_info
        <trim prefix="(" suffix=")" suffixOverrides=",">