Merge remote-tracking branch 'origin/master'

zhangherong

2 天以前 b63d81722fa0fc56f3f6da7ccf8a294f15b8253a

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java

@@ -19,6 +19,8 @@
    String SECOND_MAINTENANCE_CODE_RULE = "SecondMaintenanceCodeRule";
    //三保编码规则
    String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule";
    //三保变更编码规则
    String THIRD_MAINTENANCE_CHANGE_CODE_RULE = "ThirdMaintenanceChangeCodeRule";
    //设备借出归还
    String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule";
    //设备封存启封
@@ -35,7 +37,7 @@
    String TECHNICAL_STATUS_EVALUATION_ORDER_CHANGE_CODE_RULE = "TechnicalStatusEvaluationOrderChangeCodeRule";
    //技术状态变更编码规则
    String TECHNICAL_STATUS_CHANGE_CODE_RULE = "TechnicalStatusChangeCodeRule";
    //技术状态变更编码规则
    //技术状态鉴定申请编码规则
    String TECHNICAL_STATUS_EVALUATION_APPLY_CODE_RULE = "TechnicalStatusEvaluationApplyCodeRule";
    //停用加工设备申请编码规则
    String TECHNICAL_STATUS_DEACTIVATE_CODE_RULE = "TechnicalStatusDeactivateCodeRule";