diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java index f2d3d722..0713e853 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java @@ -3,6 +3,8 @@ package me.zhengjie.modules.wms.bd.domain; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import org.hibernate.annotations.CreationTimestamp; + import javax.persistence.*; import javax.validation.constraints.NotNull; import java.sql.Timestamp; @@ -68,10 +70,12 @@ public class ProductInfo implements Serializable { // 创建时间 @Column(name = "create_time") + @CreationTimestamp private Timestamp createTime; // 更新时间 @Column(name = "update_time") + @CreationTimestamp private Timestamp updateTime; // @NotNull diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/CustomerInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/CustomerInfoController.java index 213820d2..1a6f5314 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/CustomerInfoController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/CustomerInfoController.java @@ -27,15 +27,15 @@ public class CustomerInfoController { @Log("分页查询客户信息") @ApiOperation(value = "分页查询客户信息") - @GetMapping(value = "/customerInfos") + @GetMapping(value = "/queryCustomerInfoPage") @PreAuthorize("hasAnyRole('ADMIN','BDCUSTOMERINFO_ALL','BDCUSTOMERINFO_SELECT')") - public ResponseEntity getCustomerInfos(CustomerInfoQueryCriteria criteria, Pageable pageable){ + public ResponseEntity queryCustomerInfoPage(CustomerInfoQueryCriteria criteria, Pageable pageable){ return new ResponseEntity(customerInfoService.queryAll(criteria,pageable),HttpStatus.OK); } @Log("查询客户信息列表") @ApiOperation(value = "查询客户信息列表") - @GetMapping(value = "/customerInfo/queryCustomerInfoList") + @GetMapping(value = "/queryCustomerInfoList") @PreAuthorize("hasAnyRole('ADMIN','BDCUSTOMERINFO_ALL','BDCUSTOMERINFO_SELECT')") public ResponseEntity queryCustomerInfoList(CustomerInfoQueryCriteria criteria){ return new ResponseEntity(customerInfoService.queryAll(criteria),HttpStatus.OK); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java index 5271b669..bf55c30f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java @@ -45,9 +45,9 @@ public class ProductInfoController { @Log("分页查询产品资料") @ApiOperation(value = "分页查询产品资料") - @GetMapping(value = "/productInfo") + @GetMapping(value = "/queryProductInfoPage") @PreAuthorize("hasAnyRole('ADMIN','BDPRODUCTINFO_ALL','BDPRODUCTINFO_SELECT')") - public ResponseEntity getProductInfos(ProductInfoQueryCriteria criteria, Pageable pageable){ + public ResponseEntity queryProductInfoPage(ProductInfoQueryCriteria criteria, Pageable pageable){ return new ResponseEntity(productInfoService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -86,7 +86,7 @@ public class ProductInfoController { @Log("查看产品资料详情") @GetMapping(value = "/productInfo/{id}") - public ResponseEntity getMessureUnit(@PathVariable Long id){ + public ResponseEntity getProductInfoById(@PathVariable Long id){ return new ResponseEntity(productInfoService.findById(id), HttpStatus.OK); }