Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-06 2e9ac6878d3d7a59c200be7d74811c89dadf3a44

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

@@ -29,7 +29,7 @@
    where id = #{id,jdbcType=BIGINT}
  </delete>

  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
  <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoDemo.DemoRole">
    <!--@mbg.generated-->
    insert into demo_role (id, `name`, deleted
      )