Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java

src/main/resources/application-dev.properties

@@ -43,7 +43,7 @@ spring.servlet.multipart.max-file-size = 10MB
 spring.servlet.multipart.max-request-size= 10MB
 #访问python服务的ip(对应环境)
 access.python.ip=http://18.167.251.121
-access.python.port=9992
+access.python.port=9994
 access.python.generate_sr_port=9994
 access.python.address=http://18.167.251.121:9994
 

src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml

@@ -65,4 +65,18 @@
         RAND()
         LIMIT 20
     </select>
+
+    <select id="getIdByFileName" resultType="java.lang.Long">
+        SELECT
+            ID
+        FROM
+            ${tableName}
+        WHERE img_name = #{fileName}
+    </select>
+
+    <update id="updateStyleById">
+        update ${tableName}
+            set style = #{style}
+        where ID = #{id}
+    </update>
 </mapper>