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

yz

2021-01-31 b55c9f4ddf68de8bade1f4bf627609fb36828ba5

 febs-server/febs-server-generator/src/main/resources/mapper/GeneratorMapper.xml

@@ -28,14 +28,15 @@
        SELECT
        COLUMN_NAME name,
        CASE
            COLUMN_key
        COLUMN_key
        WHEN 'PRI' THEN
                1 ELSE 0
        1 ELSE 0
        END isKey,
        DATA_TYPE type,
        COLUMN_COMMENT remark
        FROM information_schema.COLUMNS
        WHERE TABLE_SCHEMA = #{schemaName} AND TABLE_NAME = #{tableName}
        ORDER BY ORDINAL_POSITION
    </select>

</mapper>