Merge remote-tracking branch 'origin/master'

jhjang

2022-01-05 ce82939b2d2ef793e446f464314c6e570c7ebad5

 src/main/resources/mybatis/query-template/projectRoleDepartment-template.xml

@@ -21,7 +21,7 @@
    <select id="findProjectRoleDepartment" resultType="java.util.HashMap" parameterType="java.util.HashMap">
        SELECT
        DISTINCT d.id as id,
        d.department_name as name
        d.department_name as departmentName
        FROM
        project p
        INNER JOIN project_role pr on p.id = pr.project_id