Merge remote-tracking branch 'origin/master'

yz

2021-03-07 b8d038947e66850f1a6ec1f93e1805ba33f6fdc0

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java

@@ -61,5 +61,15 @@
    /**
     * 请假类型
     */
    public final static String LEAVETYPE = "LEAVETYPE";
    public final static String LEAVE_TYPE = "LEAVETYPE";

    /**
     * 仲裁类型
     */
    public final static String ARBITRATIONTYPE = "ARBITRATIONTYPE";

    /**
     * 结案状态
     */
    public final static String  SETTLE_STATUS = "settleStatus";
}