Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/imgTool/imgUpload/vo/SafetyViolationVo.java

@@ -150,6 +150,11 @@ public class SafetyViolationVo extends PageEntity {
      */
     private String rectPhoto;
 
+    /**
+     * 工程状态
+     */
+    private String proStatus;
+
     /**
      * 违章照片
      */