diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java index 2c9fc9c..f15ac0d 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java @@ -26,7 +26,7 @@ public class SysStaffOrgRest { @GetMapping("/selAllByOrgSidPath") @ResponseBody @ApiOperation("根据组织全路径查询当前部门下的所有员工") - public ResultBean> selAllByOrgSidPath(String orgSidPath) { + public ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath) { return sysStaffOrgService.selAllByOrgSidPath(orgSidPath); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java index 84c3ea1..16bdd91 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java @@ -80,9 +80,8 @@ public class PurchaseBillDetailsVo implements Vo { private String purchaserSid; // 采购员sid(单选) @ApiModelProperty("采购员姓名") private String purchaserName; // 采购员姓名 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计到货日期") - private Date deliveryDate; // 预计到货日期 + private String deliveryDate; @ApiModelProperty("仓库sid") private String wareHouseSid; @ApiModelProperty("仓库名称") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java index de0c8a0..e4ac57e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java @@ -80,9 +80,8 @@ public class PurchaseBillDto implements Dto { private String purchaserSid; // 采购员sid(单选) @ApiModelProperty("采购员姓名") private String purchaserName; // 采购员姓名 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计到货日期") - private Date deliveryDate; // 预计到货日期 + private String deliveryDate; @ApiModelProperty("仓库sid") private String wareHouseSid; @ApiModelProperty("仓库名称") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml index 57c54aa..431fffd 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml @@ -5,7 +5,7 @@