Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/entity/SceneEntity.java

@@ -53,6 +53,7 @@ public class SceneEntity implements Serializable {
 
     /** 所属部门 */
     @ApiModelProperty(value = "所属部门")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long deptOrgId;
 
     /** 所属公司 */