Merge remote-tracking branch 'origin/master'

zhangherong

2025-03-31 32be453ce79ce4e9efbeb3ab4ef6db501a6f0230

 lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java

@@ -593,6 +593,11 @@
    String DICT_EQUIPMENT_RATE_NORMAL = "equipment_rate_normal";

    /**
     * 配送小组字典编号
     */
    String DICT_MDC_STAFF_TEAM = "mdc_staff_team";

    /**
     * 加班数据 自动计算标识 1(是) 2(否)
     */
    Integer AUTO_FLAG_Y = 1;
@@ -608,4 +613,6 @@
    String CLOSE_TYPE_0 = "0";
    String CLOSE_TYPE_1 = "1";

    String ORG_TYPE = "3";

}