Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-28 b44fd00f8c1e00558ce62b9e13b65b4a474add33

Merge branch 'zigonggao_dev' into huacheng_test

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

@@ -21,7 +21,7 @@
            (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
            create_time,
            update_time,
            (select automessage_sys_user.user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_sys_user.create_user_id) as createUserName,
            (select automessage_sys_user.user_name from automessage_sys_user where automessage_sys_user.user_id=automessage_else_accessory.create_user_id) as createUserName,
            url,
            name
        FROM