Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-10-17 f9a09c38219b9dacecaeef041a84ed647fa0290d

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -148,7 +148,7 @@


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
        insert into automessage_sys_user (
        insert ignore into automessage_sys_user (
        create_time
        <if test="userId != null and userId != '' ">,user_id</if>
        <if test="loginName != null and loginName != '' ">,login_name</if>