Merge remote-tracking branch 'origin/dev_shb' into dev-xp

# Conflicts:
#	src/main/java/com/ai/da/model/vo/DesignPythonOutfitVO.java
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java

src/main/java/com/ai/da/python/vo/DesignPythonItem.java

@@ -52,6 +52,10 @@ public class DesignPythonItem {
      * body 对应路径(后面去掉)
      */
     private String body_mask_path;
+    /**
+     *  python_t_all_info image_id
+     */
+    private Long imageId;
 
     /**
      * url在t_sys_file中的id