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

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

src/main/java/com/ai/da/mapper/entity/SysFile.java

@@ -67,6 +67,8 @@ public class SysFile implements Serializable {
      */
     private Date updateDate;
 
+    private Integer isCopy;
+
     public SysFile() {
     }