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

zjj

2 天以前 4114759a57d73661937f28a765fb8a67c017b14b

 rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java

@@ -70,4 +70,9 @@
     */
    public final static String SYS_WAVE_RULE_CODE =  "sys_wave_rule_code";

    /**
     * 波次下发执行状态
     */
    public final static String SYS_WAVE_EXCE_STATUS =  "sys_wave_exce_status";

}