Ver código fonte

Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-dependency-common

hongxudong 2 anos atrás
pai
commit
956db0802f

+ 2 - 0
src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -171,6 +171,8 @@ public enum ErrorCodeEnum {
     SHEET_PRODUCE_STATUS_CAN_NOT_CANCEL(4132, "当前工单状态不可取消"),
     SHEET_PRODUCE_STATUS_CAN_NOT_DELETE(4133, "当前工单状态不可删除"),
     SHEET_PRODUCE_STATUS_CAN_NOT_RESTART(4134, "非暂停状态工单不可重启"),
+    DICTIONARY_DATA_NOT_UPDATE(4135, "共用字典数据不能更新"),
+    
     SHEET_DISPATCH_STATUS_CAN_NOT_PAUSE(4135, "非执行状态派工单不可暂停"),
     SHEET_DISPATCH_STATUS_CAN_NOT_CANCEL(4136, "当前派工单状态不可取消"),
     SHEET_DISPATCH_STATUS_CAN_NOT_DELETE(4137, "当前派工单状态不可删除"),

+ 1 - 1
src/main/java/com/dk/common/service/UserService.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @desc : 请求用户服务
  * @date : 2022-06-07 16:03
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER )
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER)
 public interface UserService {
 
     /**