Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts: # src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
2023-09-13 10:34:09 +08:00
parent 7a6d70c2cf 41111bc0e4
commit a08300f095
101 changed files with 1597 additions and 346 deletions
--- a/src/main/resources/mapper/PantoneMapper.xml
+++ b/src/main/resources/mapper/PantoneMapper.xml
@@ -4,8 +4,7 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ai.da.mapper.entity.PanTone">
-        <id column="id" property="id" />
-        <result column="pantone_index" property="pantoneIndex" />
+        <id column="pantone_index" property="pantoneIndex" />
        <result column="name" property="name" />
        <result column="tcx" property="tcx" />
        <result column="r" property="r" />