Merge remote-tracking branch 'origin/master'

yz

2021-03-07 b8d038947e66850f1a6ec1f93e1805ba33f6fdc0

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/properties/FebsServerHrProperties.java

@@ -16,5 +16,10 @@
    /**
     * 文件上传地址
     */
    private String uploadPpath = "D:/upload/hr/";
    private String uploadCommonPath = "C:/upload/hr/commonfile/";

    private String uploadSinglePath = "C:/upload/hr/singlefile/";

    private String empBaseInfoPath = "C:/upload/hr/empBaseInfo/";

}