Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java

dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysDeptEntity.java

@@ -102,6 +102,8 @@ public class SysDeptEntity implements Serializable {
 
     private Date createTime;
 
+    private String autoRz;
+
     private String productType;
     @TableField(exist = false)
     private List<SysDeptEntity> children;