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

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java

@@ -1,8 +1,11 @@
 package com.zt.plat.module.contractorder.enums.contract;
 
+import lombok.Getter;
+
 /**
  * 字典枚举
  */
+@Getter
 public enum DictEnum {
 
     /** ERP请求状态 */
@@ -60,19 +63,7 @@ public enum DictEnum {
      */
     private final String remark;
 
-    public String getLabel() {
-        return label;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public static DictEnum getByCode(String code, String dictType) {
+    public static DictEnum getByCodeAndType(String code, String dictType) {
         return DictEnum.valueOf(dictType + "_" +code);
     }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -145,7 +145,7 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
-    public CommonResult<Boolean> submitErp(@RequestBody List<Long> ids) {
+    public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
         return success(contractService.submitErp(ids));
     }
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -105,7 +105,7 @@ public interface ContractService {
      * @param ids 合同ID集合
      * @return
      */
-    Boolean submitErp(List<Long> ids);
+    List<String> submitErp(List<Long> ids);
 
     /**
      * 删除合同