Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-06 2e9ac6878d3d7a59c200be7d74811c89dadf3a44

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml

@@ -43,10 +43,9 @@
        </if>
    </select>

    <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
    <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
        <!--@mbg.generated-->
        insert into ba_privilege (id, num, name, type
        )
        insert into ba_privilege (<include refid="Base_Column_List" />)
        values (#{id,jdbcType=BIGINT},
        #{num,jdbcType=INTEGER},
        #{name,jdbcType=VARCHAR},