Browse Source

2023年10月7日13:59:36 货运代理 基础资料 国家,包装,货物,集装箱

纪新园 2 years ago
parent
commit
e70b458295
100 changed files with 680 additions and 539 deletions
  1. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/BAccElementsDTO.java
  2. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/BAccItemsDTO.java
  3. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/BAccItemsTypeDTO.java
  4. 85 85
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/entity/BAccElements.java
  5. 6 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/entity/BAccItems.java
  6. 6 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/entity/BAccItemsType.java
  7. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/vo/BAccElementsVO.java
  8. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/vo/BAccItemsTypeVO.java
  9. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/vo/BAccItemsVO.java
  10. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/dto/BCntrTypesDTO.java
  11. 151 151
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/entity/BCntrTypes.java
  12. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/vo/BCntrTypesVO.java
  13. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/commodity/dto/BCommodityDTO.java
  14. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/commodity/entity/BCommodity.java
  15. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/commodity/vo/BCommodityVO.java
  16. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java
  17. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsAttn.java
  18. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsBadrecord.java
  19. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsBank.java
  20. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsFiles.java
  21. 4 4
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsRename.java
  22. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsTypeDefine.java
  23. 3 3
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsTypes.java
  24. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/countrys/dto/BCountrysDTO.java
  25. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/countrys/entity/BCountrys.java
  26. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/countrys/vo/BCountrysVO.java
  27. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/dto/BCurExrateDTO.java
  28. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/dto/BCurrencyDTO.java
  29. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/entity/BCurExrate.java
  30. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/entity/BCurrency.java
  31. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/vo/BCurExrateVO.java
  32. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/vo/BCurrencyVO.java
  33. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesDTO.java
  34. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesDefineDTO.java
  35. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesTypesDTO.java
  36. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/BFees.java
  37. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/BFeesDefine.java
  38. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/BFeesTypes.java
  39. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/vo/BFeesDefineVO.java
  40. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/vo/BFeesTypesVO.java
  41. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/vo/BFeesVO.java
  42. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/dto/BLinesDTO.java
  43. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/entity/BLines.java
  44. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/vo/BLinesVO.java
  45. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/locations/dto/BLocationsDTO.java
  46. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/locations/entity/BLocations.java
  47. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/locations/vo/BLocationsVO.java
  48. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/modes/dto/BTradeModesDTO.java
  49. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/modes/entity/BTradeModes.java
  50. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/modes/vo/BTradeModesVO.java
  51. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/packages/dto/BPackagesDTO.java
  52. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/packages/entity/BPackages.java
  53. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/packages/vo/BPackagesVO.java
  54. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/dto/BPortsDTO.java
  55. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/dto/BPortsTermsDTO.java
  56. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/entity/BPorts.java
  57. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/entity/BPortsTerms.java
  58. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/vo/BPortsTermsVO.java
  59. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/vo/BPortsVO.java
  60. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/dto/BServiceTermsDTO.java
  61. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/entity/BServiceTerms.java
  62. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/vo/BServiceTermsVO.java
  63. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/units/dto/BUnitsDTO.java
  64. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/units/entity/BUnits.java
  65. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/units/vo/BUnitsVO.java
  66. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/dto/BVesselsDTO.java
  67. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/entity/BVessels.java
  68. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/vo/BVesselsVO.java
  69. 1 1
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/voucher/dto/BVoucherTypeDTO.java
  70. 5 5
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/voucher/entity/BVoucherType.java
  71. 2 2
      blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/voucher/vo/BVoucherTypeVO.java
  72. 10 10
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/BAccElementsController.java
  73. 10 10
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/BAccItemsController.java
  74. 10 10
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/BAccItemsTypeController.java
  75. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/mapper/BAccElementsMapper.java
  76. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/mapper/BAccItemsMapper.java
  77. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/mapper/BAccItemsTypeMapper.java
  78. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/IBAccElementsService.java
  79. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/IBAccItemsService.java
  80. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/IBAccItemsTypeService.java
  81. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/BAccElementsServiceImpl.java
  82. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/BAccItemsServiceImpl.java
  83. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/BAccItemsTypeServiceImpl.java
  84. 25 18
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/controller/BCntrTypesController.java
  85. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/mapper/BCntrTypesMapper.java
  86. 8 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/service/IBCntrTypesService.java
  87. 38 4
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/service/impl/BCntrTypesServiceImpl.java
  88. 19 11
      blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/controller/BCommodityController.java
  89. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/mapper/BCommodityMapper.java
  90. 8 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/service/IBCommodityService.java
  91. 38 4
      blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/service/impl/BCommodityServiceImpl.java
  92. 12 11
      blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/controller/BCountrysController.java
  93. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/mapper/BCountrysMapper.java
  94. 8 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/service/IBCountrysService.java
  95. 38 4
      blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/service/impl/BCountrysServiceImpl.java
  96. 10 10
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/controller/BCurExrateController.java
  97. 10 10
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/controller/BCurrencyController.java
  98. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/mapper/BCurExrateMapper.java
  99. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/mapper/BCurrencyMapper.java
  100. 1 1
      blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/IBCurExrateService.java

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/BAccElementsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享数据传输对象实体类
+ * 基础资料-财务核算要素数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/BAccItemsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享数据传输对象实体类
+ * 基础资料-财务核算项目数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/BAccItemsTypeDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享数据传输对象实体类
+ * 基础资料-财务核算项目类别数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 85 - 85
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/entity/BAccElements.java

@@ -17,106 +17,106 @@
 package org.springblade.los.basic.acc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享实体类
+ * 基础资料-财务核算要素实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_acc_elements")
-@ApiModel(value = "BAccElements对象", description = "基础资料-财务核算要素,所有分公司共享")
+@ApiModel(value = "BAccElements对象", description = "基础资料-财务核算要素")
 public class BAccElements implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 创建人 Id
-	*/
-		@ApiModelProperty(value = "创建人 Id")
-		private Long createUser;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private String createUserName;
-	/**
-	* 创建部门 Id
-	*/
-		@ApiModelProperty(value = "创建部门 Id")
-		private Long createDept;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private String createDeptName;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
-	/**
-	* 修改人 Id
-	*/
-		@ApiModelProperty(value = "修改人 Id")
-		private Long updateUser;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private String updateUserName;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
-	/**
-	* 编码
-	*/
-		@ApiModelProperty(value = "编码")
-		private String code;
-	/**
-	* 中文名称
-	*/
-		@ApiModelProperty(value = "中文名称")
-		private String cnName;
-	/**
-	* 英文名称
-	*/
-		@ApiModelProperty(value = "英文名称")
-		private String enName;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 状态(0 正常 1停用)
-	*/
-		@ApiModelProperty(value = "状态(0 正常 1停用)")
-		private Integer status;
-	/**
-	* 是否已删除(0 否 1是)
-	*/
-		@ApiModelProperty(value = "是否已删除(0 否 1是)")
-		private Integer isDeleted;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 创建人 Id
+	 */
+	@ApiModelProperty(value = "创建人 Id")
+	private Long createUser;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建部门 Id
+	 */
+	@ApiModelProperty(value = "创建部门 Id")
+	private Long createDept;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private String createDeptName;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人 Id
+	 */
+	@ApiModelProperty(value = "修改人 Id")
+	private Long updateUser;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 编码
+	 */
+	@ApiModelProperty(value = "编码")
+	private String code;
+	/**
+	 * 中文名称
+	 */
+	@ApiModelProperty(value = "中文名称")
+	private String cnName;
+	/**
+	 * 英文名称
+	 */
+	@ApiModelProperty(value = "英文名称")
+	private String enName;
+	/**
+	 * 版本
+	 */
+	@ApiModelProperty(value = "版本")
+	private String version;
+	/**
+	 * 状态(0 正常 1停用)
+	 */
+	@ApiModelProperty(value = "状态(0 正常 1停用)")
+	private Integer status;
+	/**
+	 * 是否已删除(0 否 1是)
+	 */
+	@ApiModelProperty(value = "是否已删除(0 否 1是)")
+	private Integer isDeleted;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
 
 
 }

+ 6 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/entity/BAccItems.java

@@ -17,22 +17,23 @@
 package org.springblade.los.basic.acc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享实体类
+ * 基础资料-财务核算项目实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_acc_items")
-@ApiModel(value = "BAccItems对象", description = "基础资料-财务核算项目,所有分公司共享")
+@ApiModel(value = "BAccItems对象", description = "基础资料-财务核算项目")
 public class BAccItems implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +67,7 @@ public class BAccItems implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +82,7 @@ public class BAccItems implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 主表 los_b_acc_items_type.id
 	*/

+ 6 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/entity/BAccItemsType.java

@@ -17,22 +17,23 @@
 package org.springblade.los.basic.acc.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享实体类
+ * 基础资料-财务核算项目类别实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_acc_items_type")
-@ApiModel(value = "BAccItemsType对象", description = "基础资料-财务核算项目类别,所有分公司共享")
+@ApiModel(value = "BAccItemsType对象", description = "基础资料-财务核算项目类别")
 public class BAccItemsType implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +67,7 @@ public class BAccItemsType implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +82,7 @@ public class BAccItemsType implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 代码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/vo/BAccElementsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享视图实体类
+ * 基础资料-财务核算要素视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BAccElementsVO对象", description = "基础资料-财务核算要素,所有分公司共享")
+@ApiModel(value = "BAccElementsVO对象", description = "基础资料-财务核算要素")
 public class BAccElementsVO extends BAccElements {
 	private static final long serialVersionUID = 1L;
 

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/vo/BAccItemsTypeVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享视图实体类
+ * 基础资料-财务核算项目类别视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BAccItemsTypeVO对象", description = "基础资料-财务核算项目类别,所有分公司共享")
+@ApiModel(value = "BAccItemsTypeVO对象", description = "基础资料-财务核算项目类别")
 public class BAccItemsTypeVO extends BAccItemsType {
 	private static final long serialVersionUID = 1L;
 

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/vo/BAccItemsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享视图实体类
+ * 基础资料-财务核算项目视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BAccItemsVO对象", description = "基础资料-财务核算项目,所有分公司共享")
+@ApiModel(value = "BAccItemsVO对象", description = "基础资料-财务核算项目")
 public class BAccItemsVO extends BAccItems {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/dto/BCntrTypesDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享数据传输对象实体类
+ * 基础资料-集装箱箱型数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 151 - 151
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/entity/BCntrTypes.java

@@ -16,173 +16,173 @@
  */
 package org.springblade.los.basic.cntr.entity;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享实体类
+ * 基础资料-集装箱箱型实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_cntr_types")
-@ApiModel(value = "BCntrTypes对象", description = "基础资料-集装箱箱型,所有分公司共享")
+@ApiModel(value = "BCntrTypes对象", description = "基础资料-集装箱箱型")
 public class BCntrTypes implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 创建人 Id
-	*/
-		@ApiModelProperty(value = "创建人 Id")
-		private Long createUser;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private String createUserName;
-	/**
-	* 创建部门 Id
-	*/
-		@ApiModelProperty(value = "创建部门 Id")
-		private Long createDept;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private String createDeptName;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
-	/**
-	* 修改人 Id
-	*/
-		@ApiModelProperty(value = "修改人 Id")
-		private Long updateUser;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private String updateUserName;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
-	/**
-	* 箱型 ISO 代码,20GP,40HC etc.
-	*/
-		@ApiModelProperty(value = "箱型 ISO 代码,20GP,40HC etc.")
-		private String code;
-	/**
-	* 箱型 95 码,22G1, 45R1 etc.
-	*/
-		@ApiModelProperty(value = "箱型 95 码,22G1, 45R1 etc.")
-		private String code95;
-	/**
-	* 海关代码
-	*/
-		@ApiModelProperty(value = "海关代码")
-		private String customsCode;
-	/**
-	* 箱型 GP, HC, COLOAD etc.
-	*/
-		@ApiModelProperty(value = "箱型 GP, HC, COLOAD etc.")
-		private String cntrType;
-	/**
-	* 尺码 V20, V40, COLOAD etc.
-	*/
-		@ApiModelProperty(value = "尺码 V20, V40, COLOAD etc.")
-		private String cntrSize;
-	/**
-	* 中文名称
-	*/
-		@ApiModelProperty(value = "中文名称")
-		private String cnName;
-	/**
-	* 英文名称
-	*/
-		@ApiModelProperty(value = "英文名称")
-		private String enName;
-	/**
-	* 皮重 KGS
-	*/
-		@ApiModelProperty(value = "皮重 KGS")
-		private BigDecimal tareWeight;
-	/**
-	* 净重,即货重 KGS
-	*/
-		@ApiModelProperty(value = "净重,即货重 KGS")
-		private BigDecimal netWeight;
-	/**
-	* 毛重,即最大总重 KGS
-	*/
-		@ApiModelProperty(value = "毛重,即最大总重 KGS")
-		private BigDecimal grossWeight;
-	/**
-	* 体积 CBM
-	*/
-		@ApiModelProperty(value = "体积 CBM")
-		private BigDecimal volume;
-	/**
-	* TEU
-	*/
-		@ApiModelProperty(value = "TEU")
-		private BigDecimal teu;
-	/**
-	* 是否普柜
-	*/
-		@ApiModelProperty(value = "是否普柜")
-		private Integer isGeneral;
-	/**
-	* 是否冻柜
-	*/
-		@ApiModelProperty(value = "是否冻柜")
-		private Integer isReefer;
-	/**
-	* 是否危柜
-	*/
-		@ApiModelProperty(value = "是否危柜")
-		private Integer isDanger;
-	/**
-	* JSON 对象数组,用于不查询的扩展数据, 例如:[{name: "key1", value: "value1"}]
-	*/
-		@ApiModelProperty(value = "JSON 对象数组,用于不查询的扩展数据")
-		private String extendedData;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 状态(0 正常 1停用)
-	*/
-		@ApiModelProperty(value = "状态(0 正常 1停用)")
-		private Integer status;
-	/**
-	* 是否已删除(0 否 1是)
-	*/
-		@ApiModelProperty(value = "是否已删除(0 否 1是)")
-		private Integer isDeleted;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 创建人 Id
+	 */
+	@ApiModelProperty(value = "创建人 Id")
+	private Long createUser;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建部门 Id
+	 */
+	@ApiModelProperty(value = "创建部门 Id")
+	private String createDept;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private String createDeptName;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人 Id
+	 */
+	@ApiModelProperty(value = "修改人 Id")
+	private Long updateUser;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 箱型 ISO 代码,20GP,40HC etc.
+	 */
+	@ApiModelProperty(value = "箱型 ISO 代码,20GP,40HC etc.")
+	private String code;
+	/**
+	 * 箱型 95 码,22G1, 45R1 etc.
+	 */
+	@ApiModelProperty(value = "箱型 95 码,22G1, 45R1 etc.")
+	private String code95;
+	/**
+	 * 海关代码
+	 */
+	@ApiModelProperty(value = "海关代码")
+	private String customsCode;
+	/**
+	 * 箱型 GP, HC, COLOAD etc.
+	 */
+	@ApiModelProperty(value = "箱型 GP, HC, COLOAD etc.")
+	private String cntrType;
+	/**
+	 * 尺码 V20, V40, COLOAD etc.
+	 */
+	@ApiModelProperty(value = "尺码 V20, V40, COLOAD etc.")
+	private String cntrSize;
+	/**
+	 * 中文名称
+	 */
+	@ApiModelProperty(value = "中文名称")
+	private String cnName;
+	/**
+	 * 英文名称
+	 */
+	@ApiModelProperty(value = "英文名称")
+	private String enName;
+	/**
+	 * 皮重 KGS
+	 */
+	@ApiModelProperty(value = "皮重 KGS")
+	private BigDecimal tareWeight;
+	/**
+	 * 净重,即货重 KGS
+	 */
+	@ApiModelProperty(value = "净重,即货重 KGS")
+	private BigDecimal netWeight;
+	/**
+	 * 毛重,即最大总重 KGS
+	 */
+	@ApiModelProperty(value = "毛重,即最大总重 KGS")
+	private BigDecimal grossWeight;
+	/**
+	 * 体积 CBM
+	 */
+	@ApiModelProperty(value = "体积 CBM")
+	private BigDecimal volume;
+	/**
+	 * TEU
+	 */
+	@ApiModelProperty(value = "TEU")
+	private BigDecimal teu;
+	/**
+	 * 是否普柜
+	 */
+	@ApiModelProperty(value = "是否普柜")
+	private Integer isGeneral;
+	/**
+	 * 是否冻柜
+	 */
+	@ApiModelProperty(value = "是否冻柜")
+	private Integer isReefer;
+	/**
+	 * 是否危柜
+	 */
+	@ApiModelProperty(value = "是否危柜")
+	private Integer isDanger;
+	/**
+	 * JSON 对象数组,用于不查询的扩展数据, 例如:[{name: "key1", value: "value1"}]
+	 */
+	@ApiModelProperty(value = "JSON 对象数组,用于不查询的扩展数据")
+	private String extendedData;
+	/**
+	 * 版本
+	 */
+	@ApiModelProperty(value = "版本")
+	private String version;
+	/**
+	 * 状态(0 正常 1停用)
+	 */
+	@ApiModelProperty(value = "状态(0 正常 1停用)")
+	private Integer status;
+	/**
+	 * 是否已删除(0 否 1是)
+	 */
+	@ApiModelProperty(value = "是否已删除(0 否 1是)")
+	private Integer isDeleted;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
 
 
 }

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cntr/vo/BCntrTypesVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享视图实体类
+ * 基础资料-集装箱箱型视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BCntrTypesVO对象", description = "基础资料-集装箱箱型,所有分公司共享")
+@ApiModel(value = "BCntrTypesVO对象", description = "基础资料-集装箱箱型")
 public class BCntrTypesVO extends BCntrTypes {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/commodity/dto/BCommodityDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-商品资料,所有分公司共享数据传输对象实体类
+ * 基础资料-商品资料数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/commodity/entity/BCommodity.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.commodity.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-商品资料,所有分公司共享实体类
+ * 基础资料-商品资料实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_commodity")
-@ApiModel(value = "BCommodity对象", description = "基础资料-商品资料,所有分公司共享")
+@ApiModel(value = "BCommodity对象", description = "基础资料-商品资料")
 public class BCommodity implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BCommodity implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BCommodity implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* HS CODE(The Harmonization System Code)
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/commodity/vo/BCommodityVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-商品资料,所有分公司共享视图实体类
+ * 基础资料-商品资料视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BCommodityVO对象", description = "基础资料-商品资料,所有分公司共享")
+@ApiModel(value = "BCommodityVO对象", description = "基础资料-商品资料")
 public class BCommodityVO extends BCommodity {
 	private static final long serialVersionUID = 1L;
 

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -18,7 +18,7 @@ package org.springblade.los.basic.corps.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -72,7 +72,7 @@ public class BCorps implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -87,7 +87,7 @@ public class BCorps implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 单位编码
 	*/

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsAttn.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +71,7 @@ public class BCorpsAttn implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -86,7 +86,7 @@ public class BCorpsAttn implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 主表id
 	*/

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsBadrecord.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +71,7 @@ public class BCorpsBadrecord implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -86,7 +86,7 @@ public class BCorpsBadrecord implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 主表客户id
 	*/

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsBank.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +71,7 @@ public class BCorpsBank implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -86,7 +86,7 @@ public class BCorpsBank implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 主表id
 	*/

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsFiles.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +71,7 @@ public class BCorpsFiles implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -86,7 +86,7 @@ public class BCorpsFiles implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 主表id
 	*/

+ 4 - 4
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsRename.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +71,7 @@ public class BCorpsRename implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -86,7 +86,7 @@ public class BCorpsRename implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 主表客户id
 	*/
@@ -126,7 +126,7 @@ public class BCorpsRename implements Serializable {
 	* 操作时间
 	*/
 		@ApiModelProperty(value = "操作时间")
-		private LocalDateTime byTime;
+		private Date byTime;
 	/**
 	* 版本
 	*/

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsTypeDefine.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -66,7 +66,7 @@ public class BCorpsTypeDefine implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BCorpsTypeDefine implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 父主键
 	*/

+ 3 - 3
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorpsTypes.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.corps.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,7 +71,7 @@ public class BCorpsTypes implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -86,7 +86,7 @@ public class BCorpsTypes implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 客户类别id
 	*/

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/countrys/dto/BCountrysDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-国家或地区,所有分公司共享数据传输对象实体类
+ * 基础资料-国家或地区数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/countrys/entity/BCountrys.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.countrys.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-国家或地区,所有分公司共享实体类
+ * 基础资料-国家或地区实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_countrys")
-@ApiModel(value = "BCountrys对象", description = "基础资料-国家或地区,所有分公司共享")
+@ApiModel(value = "BCountrys对象", description = "基础资料-国家或地区")
 public class BCountrys implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BCountrys implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BCountrys implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 编码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/countrys/vo/BCountrysVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-国家或地区,所有分公司共享视图实体类
+ * 基础资料-国家或地区视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BCountrysVO对象", description = "基础资料-国家或地区,所有分公司共享")
+@ApiModel(value = "BCountrysVO对象", description = "基础资料-国家或地区")
 public class BCountrysVO extends BCountrys {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/dto/BCurExrateDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-币种汇率,所有分公司共享数据传输对象实体类
+ * 基础资料-币种汇率数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/dto/BCurrencyDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-币种,所有分公司共享数据传输对象实体类
+ * 基础资料-币种数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/entity/BCurExrate.java

@@ -18,7 +18,7 @@ package org.springblade.los.basic.cur.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,14 +26,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-币种汇率,所有分公司共享实体类
+ * 基础资料-币种汇率实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_cur_exrate")
-@ApiModel(value = "BCurExrate对象", description = "基础资料-币种汇率,所有分公司共享")
+@ApiModel(value = "BCurExrate对象", description = "基础资料-币种汇率")
 public class BCurExrate implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ public class BCurExrate implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -82,7 +82,7 @@ public class BCurExrate implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 币种代码
 	*/

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/entity/BCurrency.java

@@ -18,7 +18,7 @@ package org.springblade.los.basic.cur.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,14 +26,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-币种,所有分公司共享实体类
+ * 基础资料-币种实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_currency")
-@ApiModel(value = "BCurrency对象", description = "基础资料-币种,所有分公司共享")
+@ApiModel(value = "BCurrency对象", description = "基础资料-币种")
 public class BCurrency implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ public class BCurrency implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -82,7 +82,7 @@ public class BCurrency implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 编码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/vo/BCurExrateVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-币种汇率,所有分公司共享视图实体类
+ * 基础资料-币种汇率视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BCurExrateVO对象", description = "基础资料-币种汇率,所有分公司共享")
+@ApiModel(value = "BCurExrateVO对象", description = "基础资料-币种汇率")
 public class BCurExrateVO extends BCurExrate {
 	private static final long serialVersionUID = 1L;
 

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/cur/vo/BCurrencyVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-币种,所有分公司共享视图实体类
+ * 基础资料-币种视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BCurrencyVO对象", description = "基础资料-币种,所有分公司共享")
+@ApiModel(value = "BCurrencyVO对象", description = "基础资料-币种")
 public class BCurrencyVO extends BCurrency {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-费用,所有分公司共享数据传输对象实体类
+ * 基础资料-费用数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesDefineDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-费用类别,所有分公司共享数据传输对象实体类
+ * 基础资料-费用类别数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/dto/BFeesTypesDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-费用及其类别关系表,所有分公司共享数据传输对象实体类
+ * 基础资料-费用及其类别关系表数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/BFees.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.fees.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-费用,所有分公司共享实体类
+ * 基础资料-费用实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_fees")
-@ApiModel(value = "BFees对象", description = "基础资料-费用,所有分公司共享")
+@ApiModel(value = "BFees对象", description = "基础资料-费用")
 public class BFees implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BFees implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BFees implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 费用编码
 	*/

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/BFeesDefine.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.fees.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-费用类别,所有分公司共享实体类
+ * 基础资料-费用类别实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_fees_define")
-@ApiModel(value = "BFeesDefine对象", description = "基础资料-费用类别,所有分公司共享")
+@ApiModel(value = "BFeesDefine对象", description = "基础资料-费用类别")
 public class BFeesDefine implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BFeesDefine implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BFeesDefine implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 父主键
 	*/

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/entity/BFeesTypes.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.fees.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-费用及其类别关系表,所有分公司共享实体类
+ * 基础资料-费用及其类别关系表实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_fees_types")
-@ApiModel(value = "BFeesTypes对象", description = "基础资料-费用及其类别关系表,所有分公司共享")
+@ApiModel(value = "BFeesTypes对象", description = "基础资料-费用及其类别关系表")
 public class BFeesTypes implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BFeesTypes implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BFeesTypes implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 费用类别 id
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/vo/BFeesDefineVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-费用类别,所有分公司共享视图实体类
+ * 基础资料-费用类别视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BFeesDefineVO对象", description = "基础资料-费用类别,所有分公司共享")
+@ApiModel(value = "BFeesDefineVO对象", description = "基础资料-费用类别")
 public class BFeesDefineVO extends BFeesDefine {
 	private static final long serialVersionUID = 1L;
 

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/vo/BFeesTypesVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-费用及其类别关系表,所有分公司共享视图实体类
+ * 基础资料-费用及其类别关系表视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BFeesTypesVO对象", description = "基础资料-费用及其类别关系表,所有分公司共享")
+@ApiModel(value = "BFeesTypesVO对象", description = "基础资料-费用及其类别关系表")
 public class BFeesTypesVO extends BFeesTypes {
 	private static final long serialVersionUID = 1L;
 

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/fees/vo/BFeesVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-费用,所有分公司共享视图实体类
+ * 基础资料-费用视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BFeesVO对象", description = "基础资料-费用,所有分公司共享")
+@ApiModel(value = "BFeesVO对象", description = "基础资料-费用")
 public class BFeesVO extends BFees {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/dto/BLinesDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-航线,所有分公司共享数据传输对象实体类
+ * 基础资料-航线数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/entity/BLines.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.lines.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-航线,所有分公司共享实体类
+ * 基础资料-航线实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_lines")
-@ApiModel(value = "BLines对象", description = "基础资料-航线,所有分公司共享")
+@ApiModel(value = "BLines对象", description = "基础资料-航线")
 public class BLines implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BLines implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BLines implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 航线编码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/lines/vo/BLinesVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-航线,所有分公司共享视图实体类
+ * 基础资料-航线视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BLinesVO对象", description = "基础资料-航线,所有分公司共享")
+@ApiModel(value = "BLinesVO对象", description = "基础资料-航线")
 public class BLinesVO extends BLines {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/locations/dto/BLocationsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-地点代码,包括内陆点,所有分公司共享数据传输对象实体类
+ * 基础资料-地点代码,包括内陆点数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/locations/entity/BLocations.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.locations.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-地点代码,包括内陆点,所有分公司共享实体类
+ * 基础资料-地点代码,包括内陆点实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_locations")
-@ApiModel(value = "BLocations对象", description = "基础资料-地点代码,包括内陆点,所有分公司共享")
+@ApiModel(value = "BLocations对象", description = "基础资料-地点代码,包括内陆点")
 public class BLocations implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BLocations implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BLocations implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 港口编码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/locations/vo/BLocationsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-地点代码,包括内陆点,所有分公司共享视图实体类
+ * 基础资料-地点代码,包括内陆点视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BLocationsVO对象", description = "基础资料-地点代码,包括内陆点,所有分公司共享")
+@ApiModel(value = "BLocationsVO对象", description = "基础资料-地点代码,包括内陆点")
 public class BLocationsVO extends BLocations {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/modes/dto/BTradeModesDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-贸易方式,所有分公司共享数据传输对象实体类
+ * 基础资料-贸易方式数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/modes/entity/BTradeModes.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.modes.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-贸易方式,所有分公司共享实体类
+ * 基础资料-贸易方式实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_trade_modes")
-@ApiModel(value = "BTradeModes对象", description = "基础资料-贸易方式,所有分公司共享")
+@ApiModel(value = "BTradeModes对象", description = "基础资料-贸易方式")
 public class BTradeModes implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BTradeModes implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BTradeModes implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 代码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/modes/vo/BTradeModesVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-贸易方式,所有分公司共享视图实体类
+ * 基础资料-贸易方式视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BTradeModesVO对象", description = "基础资料-贸易方式,所有分公司共享")
+@ApiModel(value = "BTradeModesVO对象", description = "基础资料-贸易方式")
 public class BTradeModesVO extends BTradeModes {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/packages/dto/BPackagesDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-包装单位,所有分公司共享数据传输对象实体类
+ * 基础资料-包装单位数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/packages/entity/BPackages.java

@@ -18,7 +18,7 @@ package org.springblade.los.basic.packages.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,14 +26,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-包装单位,所有分公司共享实体类
+ * 基础资料-包装单位实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_packages")
-@ApiModel(value = "BPackages对象", description = "基础资料-包装单位,所有分公司共享")
+@ApiModel(value = "BPackages对象", description = "基础资料-包装单位")
 public class BPackages implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ public class BPackages implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -82,7 +82,7 @@ public class BPackages implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 编码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/packages/vo/BPackagesVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-包装单位,所有分公司共享视图实体类
+ * 基础资料-包装单位视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BPackagesVO对象", description = "基础资料-包装单位,所有分公司共享")
+@ApiModel(value = "BPackagesVO对象", description = "基础资料-包装单位")
 public class BPackagesVO extends BPackages {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/dto/BPortsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-港口,所有分公司共享数据传输对象实体类
+ * 基础资料-港口数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/dto/BPortsTermsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求,所有分公司共享数据传输对象实体类
+ * 基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/entity/BPorts.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.ports.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-港口,所有分公司共享实体类
+ * 基础资料-港口实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_ports")
-@ApiModel(value = "BPorts对象", description = "基础资料-港口,所有分公司共享")
+@ApiModel(value = "BPorts对象", description = "基础资料-港口")
 public class BPorts implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BPorts implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BPorts implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 港口编码
 	*/

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/entity/BPortsTerms.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.ports.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求,所有分公司共享实体类
+ * 基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_ports_terms")
-@ApiModel(value = "BPortsTerms对象", description = "基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求,所有分公司共享")
+@ApiModel(value = "BPortsTerms对象", description = "基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求")
 public class BPortsTerms implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BPortsTerms implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BPortsTerms implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 港口 Id
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/vo/BPortsTermsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求,所有分公司共享视图实体类
+ * 基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BPortsTermsVO对象", description = "基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求,所有分公司共享")
+@ApiModel(value = "BPortsTermsVO对象", description = "基础资料-港口条款,用于指定某船公司在该港口的条款及特殊要求")
 public class BPortsTermsVO extends BPortsTerms {
 	private static final long serialVersionUID = 1L;
 

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/ports/vo/BPortsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-港口,所有分公司共享视图实体类
+ * 基础资料-港口视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BPortsVO对象", description = "基础资料-港口,所有分公司共享")
+@ApiModel(value = "BPortsVO对象", description = "基础资料-港口")
 public class BPortsVO extends BPorts {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/dto/BServiceTermsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-服务条款,所有分公司共享数据传输对象实体类
+ * 基础资料-服务条款数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/entity/BServiceTerms.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.terms.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-服务条款,所有分公司共享实体类
+ * 基础资料-服务条款实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_service_terms")
-@ApiModel(value = "BServiceTerms对象", description = "基础资料-服务条款,所有分公司共享")
+@ApiModel(value = "BServiceTerms对象", description = "基础资料-服务条款")
 public class BServiceTerms implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BServiceTerms implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BServiceTerms implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 条款代码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/terms/vo/BServiceTermsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-服务条款,所有分公司共享视图实体类
+ * 基础资料-服务条款视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BServiceTermsVO对象", description = "基础资料-服务条款,所有分公司共享")
+@ApiModel(value = "BServiceTermsVO对象", description = "基础资料-服务条款")
 public class BServiceTermsVO extends BServiceTerms {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/units/dto/BUnitsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-计量单位,所有分公司共享数据传输对象实体类
+ * 基础资料-计量单位数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/units/entity/BUnits.java

@@ -18,7 +18,7 @@ package org.springblade.los.basic.units.entity;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,14 +26,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-计量单位,所有分公司共享实体类
+ * 基础资料-计量单位实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_units")
-@ApiModel(value = "BUnits对象", description = "基础资料-计量单位,所有分公司共享")
+@ApiModel(value = "BUnits对象", description = "基础资料-计量单位")
 public class BUnits implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ public class BUnits implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -82,7 +82,7 @@ public class BUnits implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 代码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/units/vo/BUnitsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-计量单位,所有分公司共享视图实体类
+ * 基础资料-计量单位视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BUnitsVO对象", description = "基础资料-计量单位,所有分公司共享")
+@ApiModel(value = "BUnitsVO对象", description = "基础资料-计量单位")
 public class BUnitsVO extends BUnits {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/dto/BVesselsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-船名,所有分公司共享数据传输对象实体类
+ * 基础资料-船名数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/entity/BVessels.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.vessels.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-船名,所有分公司共享实体类
+ * 基础资料-船名实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_vessels")
-@ApiModel(value = "BVessels对象", description = "基础资料-船名,所有分公司共享")
+@ApiModel(value = "BVessels对象", description = "基础资料-船名")
 public class BVessels implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BVessels implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BVessels implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 船舶编码
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/vessels/vo/BVesselsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-船名,所有分公司共享视图实体类
+ * 基础资料-船名视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BVesselsVO对象", description = "基础资料-船名,所有分公司共享")
+@ApiModel(value = "BVesselsVO对象", description = "基础资料-船名")
 public class BVesselsVO extends BVessels {
 	private static final long serialVersionUID = 1L;
 

+ 1 - 1
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/voucher/dto/BVoucherTypeDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 基础资料-凭证类型,所有分公司共享数据传输对象实体类
+ * 基础资料-凭证类型数据传输对象实体类
  *
  * @author BladeX
  * @since 2023-10-07

+ 5 - 5
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/voucher/entity/BVoucherType.java

@@ -17,7 +17,7 @@
 package org.springblade.los.basic.voucher.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,14 +25,14 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 基础资料-凭证类型,所有分公司共享实体类
+ * 基础资料-凭证类型实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @TableName("los_b_voucher_type")
-@ApiModel(value = "BVoucherType对象", description = "基础资料-凭证类型,所有分公司共享")
+@ApiModel(value = "BVoucherType对象", description = "基础资料-凭证类型")
 public class BVoucherType implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -66,7 +66,7 @@ public class BVoucherType implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人 Id
 	*/
@@ -81,7 +81,7 @@ public class BVoucherType implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 会计年度
 	*/

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/voucher/vo/BVoucherTypeVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 基础资料-凭证类型,所有分公司共享视图实体类
+ * 基础资料-凭证类型视图实体类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "BVoucherTypeVO对象", description = "基础资料-凭证类型,所有分公司共享")
+@ApiModel(value = "BVoucherTypeVO对象", description = "基础资料-凭证类型")
 public class BVoucherTypeVO extends BVoucherType {
 	private static final long serialVersionUID = 1L;
 

+ 10 - 10
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/BAccElementsController.java

@@ -35,7 +35,7 @@ import org.springblade.los.basic.acc.service.IBAccElementsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享 控制器
+ * 基础资料-财务核算要素 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/baccelements")
-@Api(value = "基础资料-财务核算要素,所有分公司共享", tags = "基础资料-财务核算要素,所有分公司共享接口")
+@Api(value = "基础资料-财务核算要素", tags = "基础资料-财务核算要素接口")
 public class BAccElementsController extends BladeController {
 
 	private final IBAccElementsService bAccElementsService;
@@ -60,7 +60,7 @@ public class BAccElementsController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-财务核算要素,所有分公司共享
+	 * 分页 基础资料-财务核算要素
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +71,7 @@ public class BAccElementsController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-财务核算要素,所有分公司共享
+	 * 自定义分页 基础资料-财务核算要素
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +82,7 @@ public class BAccElementsController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-财务核算要素,所有分公司共享
+	 * 新增 基础资料-财务核算要素
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +92,7 @@ public class BAccElementsController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-财务核算要素,所有分公司共享
+	 * 修改 基础资料-财务核算要素
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,7 +102,7 @@ public class BAccElementsController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-财务核算要素,所有分公司共享
+	 * 新增或修改 基础资料-财务核算要素
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -111,9 +111,9 @@ public class BAccElementsController extends BladeController {
 		return R.status(bAccElementsService.saveOrUpdate(bAccElements));
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-财务核算要素,所有分公司共享
+	 * 删除 基础资料-财务核算要素
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +122,5 @@ public class BAccElementsController extends BladeController {
 		return R.status(bAccElementsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 10 - 10
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/BAccItemsController.java

@@ -35,7 +35,7 @@ import org.springblade.los.basic.acc.service.IBAccItemsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享 控制器
+ * 基础资料-财务核算项目 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/baccitems")
-@Api(value = "基础资料-财务核算项目,所有分公司共享", tags = "基础资料-财务核算项目,所有分公司共享接口")
+@Api(value = "基础资料-财务核算项目", tags = "基础资料-财务核算项目接口")
 public class BAccItemsController extends BladeController {
 
 	private final IBAccItemsService bAccItemsService;
@@ -60,7 +60,7 @@ public class BAccItemsController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-财务核算项目,所有分公司共享
+	 * 分页 基础资料-财务核算项目
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +71,7 @@ public class BAccItemsController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-财务核算项目,所有分公司共享
+	 * 自定义分页 基础资料-财务核算项目
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +82,7 @@ public class BAccItemsController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-财务核算项目,所有分公司共享
+	 * 新增 基础资料-财务核算项目
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +92,7 @@ public class BAccItemsController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-财务核算项目,所有分公司共享
+	 * 修改 基础资料-财务核算项目
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,7 +102,7 @@ public class BAccItemsController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-财务核算项目,所有分公司共享
+	 * 新增或修改 基础资料-财务核算项目
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -111,9 +111,9 @@ public class BAccItemsController extends BladeController {
 		return R.status(bAccItemsService.saveOrUpdate(bAccItems));
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-财务核算项目,所有分公司共享
+	 * 删除 基础资料-财务核算项目
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +122,5 @@ public class BAccItemsController extends BladeController {
 		return R.status(bAccItemsService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 10 - 10
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/BAccItemsTypeController.java

@@ -35,7 +35,7 @@ import org.springblade.los.basic.acc.service.IBAccItemsTypeService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享 控制器
+ * 基础资料-财务核算项目类别 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/baccitemstype")
-@Api(value = "基础资料-财务核算项目类别,所有分公司共享", tags = "基础资料-财务核算项目类别,所有分公司共享接口")
+@Api(value = "基础资料-财务核算项目类别", tags = "基础资料-财务核算项目类别接口")
 public class BAccItemsTypeController extends BladeController {
 
 	private final IBAccItemsTypeService bAccItemsTypeService;
@@ -60,7 +60,7 @@ public class BAccItemsTypeController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-财务核算项目类别,所有分公司共享
+	 * 分页 基础资料-财务核算项目类别
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +71,7 @@ public class BAccItemsTypeController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-财务核算项目类别,所有分公司共享
+	 * 自定义分页 基础资料-财务核算项目类别
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +82,7 @@ public class BAccItemsTypeController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-财务核算项目类别,所有分公司共享
+	 * 新增 基础资料-财务核算项目类别
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +92,7 @@ public class BAccItemsTypeController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-财务核算项目类别,所有分公司共享
+	 * 修改 基础资料-财务核算项目类别
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,7 +102,7 @@ public class BAccItemsTypeController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-财务核算项目类别,所有分公司共享
+	 * 新增或修改 基础资料-财务核算项目类别
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -111,9 +111,9 @@ public class BAccItemsTypeController extends BladeController {
 		return R.status(bAccItemsTypeService.saveOrUpdate(bAccItemsType));
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-财务核算项目类别,所有分公司共享
+	 * 删除 基础资料-财务核算项目类别
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +122,5 @@ public class BAccItemsTypeController extends BladeController {
 		return R.status(bAccItemsTypeService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/mapper/BAccElementsMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享 Mapper 接口
+ * 基础资料-财务核算要素 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/mapper/BAccItemsMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享 Mapper 接口
+ * 基础资料-财务核算项目 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/mapper/BAccItemsTypeMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享 Mapper 接口
+ * 基础资料-财务核算项目类别 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/IBAccElementsService.java

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享 服务类
+ * 基础资料-财务核算要素 服务类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/IBAccItemsService.java

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享 服务类
+ * 基础资料-财务核算项目 服务类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/IBAccItemsTypeService.java

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享 服务类
+ * 基础资料-财务核算项目类别 服务类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/BAccElementsServiceImpl.java

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-财务核算要素,所有分公司共享 服务实现类
+ * 基础资料-财务核算要素 服务实现类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/BAccItemsServiceImpl.java

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-财务核算项目,所有分公司共享 服务实现类
+ * 基础资料-财务核算项目 服务实现类
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/BAccItemsTypeServiceImpl.java

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-财务核算项目类别,所有分公司共享 服务实现类
+ * 基础资料-财务核算项目类别 服务实现类
  *
  * @author BladeX
  * @since 2023-10-07

+ 25 - 18
blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/controller/BCntrTypesController.java

@@ -16,26 +16,31 @@
  */
 package org.springblade.los.basic.cntr.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.cntr.entity.BCntrTypes;
-import org.springblade.los.basic.cntr.vo.BCntrTypesVO;
 import org.springblade.los.basic.cntr.service.IBCntrTypesService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.los.basic.cntr.vo.BCntrTypesVO;
+import org.springblade.system.feign.ISysClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享 控制器
+ * 基础资料-集装箱箱型 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,11 +48,13 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bcntrtypes")
-@Api(value = "基础资料-集装箱箱型,所有分公司共享", tags = "基础资料-集装箱箱型,所有分公司共享接口")
+@Api(value = "基础资料-集装箱箱型", tags = "基础资料-集装箱箱型接口")
 public class BCntrTypesController extends BladeController {
 
 	private final IBCntrTypesService bCntrTypesService;
 
+	private final ISysClient sysClient;
+
 	/**
 	 * 详情
 	 */
@@ -60,7 +67,7 @@ public class BCntrTypesController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-集装箱箱型,所有分公司共享
+	 * 分页 基础资料-集装箱箱型
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +78,7 @@ public class BCntrTypesController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-集装箱箱型,所有分公司共享
+	 * 自定义分页 基础资料-集装箱箱型
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +89,7 @@ public class BCntrTypesController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-集装箱箱型,所有分公司共享
+	 * 新增 基础资料-集装箱箱型
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +99,7 @@ public class BCntrTypesController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-集装箱箱型,所有分公司共享
+	 * 修改 基础资料-集装箱箱型
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,18 +109,18 @@ public class BCntrTypesController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-集装箱箱型,所有分公司共享
+	 * 新增或修改 基础资料-集装箱箱型
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入bCntrTypes")
 	public R submit(@Valid @RequestBody BCntrTypes bCntrTypes) {
-		return R.status(bCntrTypesService.saveOrUpdate(bCntrTypes));
+		return bCntrTypesService.submit(bCntrTypes);
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-集装箱箱型,所有分公司共享
+	 * 删除 基础资料-集装箱箱型
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +129,5 @@ public class BCntrTypesController extends BladeController {
 		return R.status(bCntrTypesService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/mapper/BCntrTypesMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享 Mapper 接口
+ * 基础资料-集装箱箱型 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 8 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/service/IBCntrTypesService.java

@@ -16,13 +16,14 @@
  */
 package org.springblade.los.basic.cntr.service;
 
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.cntr.entity.BCntrTypes;
 import org.springblade.los.basic.cntr.vo.BCntrTypesVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享 服务类
+ * 基础资料-集装箱箱型 服务类
  *
  * @author BladeX
  * @since 2023-10-07
@@ -38,4 +39,10 @@ public interface IBCntrTypesService extends IService<BCntrTypes> {
 	 */
 	IPage<BCntrTypesVO> selectBCntrTypesPage(IPage<BCntrTypesVO> page, BCntrTypesVO bCntrTypes);
 
+	/**
+	 * 新增或修改 基础资料-集装箱箱型
+	 * @param bCntrTypes
+	 * @return
+	 */
+	R submit(BCntrTypes bCntrTypes);
 }

+ 38 - 4
blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/service/impl/BCntrTypesServiceImpl.java

@@ -16,26 +16,60 @@
  */
 package org.springblade.los.basic.cntr.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.cntr.entity.BCntrTypes;
-import org.springblade.los.basic.cntr.vo.BCntrTypesVO;
 import org.springblade.los.basic.cntr.mapper.BCntrTypesMapper;
 import org.springblade.los.basic.cntr.service.IBCntrTypesService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.los.basic.cntr.vo.BCntrTypesVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * 基础资料-集装箱箱型,所有分公司共享 服务实现类
+ * 基础资料-集装箱箱型 服务实现类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Service
+@AllArgsConstructor
 public class BCntrTypesServiceImpl extends ServiceImpl<BCntrTypesMapper, BCntrTypes> implements IBCntrTypesService {
 
+
+	private final ISysClient sysClient;
+
 	@Override
 	public IPage<BCntrTypesVO> selectBCntrTypesPage(IPage<BCntrTypesVO> page, BCntrTypesVO bCntrTypes) {
 		return page.setRecords(baseMapper.selectBCntrTypesPage(page, bCntrTypes));
 	}
 
+	@Override
+	public R submit(BCntrTypes bCntrTypes) {
+		if (bCntrTypes.getId() == null) {
+			bCntrTypes.setCreateTime(new Date());
+			bCntrTypes.setCreateUser(AuthUtil.getUserId());
+			bCntrTypes.setCreateUserName(AuthUtil.getUserName());
+			//获取部门ids对应中文名
+			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+				bCntrTypes.setCreateDept(AuthUtil.getDeptId());
+				R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
+				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+					bCntrTypes.setCreateDeptName(String.join(",", res.getData()));
+				}
+			}
+		} else {
+			bCntrTypes.setUpdateUser(AuthUtil.getUserId());
+			bCntrTypes.setUpdateUserName(AuthUtil.getUserName());
+		}
+		this.saveOrUpdate(bCntrTypes);
+		return R.data(bCntrTypes);
+	}
+
 }

+ 19 - 11
blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/controller/BCommodityController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.basic.commodity.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,8 +26,10 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.commodity.entity.BCommodity;
@@ -34,8 +37,11 @@ import org.springblade.los.basic.commodity.vo.BCommodityVO;
 import org.springblade.los.basic.commodity.service.IBCommodityService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.Date;
+import java.util.List;
+
 /**
- * 基础资料-商品资料,所有分公司共享 控制器
+ * 基础资料-商品资料 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,11 +49,13 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bcommodity")
-@Api(value = "基础资料-商品资料,所有分公司共享", tags = "基础资料-商品资料,所有分公司共享接口")
+@Api(value = "基础资料-商品资料", tags = "基础资料-商品资料接口")
 public class BCommodityController extends BladeController {
 
 	private final IBCommodityService bCommodityService;
 
+	private final ISysClient sysClient;
+
 	/**
 	 * 详情
 	 */
@@ -60,7 +68,7 @@ public class BCommodityController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-商品资料,所有分公司共享
+	 * 分页 基础资料-商品资料
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +79,7 @@ public class BCommodityController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-商品资料,所有分公司共享
+	 * 自定义分页 基础资料-商品资料
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +90,7 @@ public class BCommodityController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-商品资料,所有分公司共享
+	 * 新增 基础资料-商品资料
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +100,7 @@ public class BCommodityController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-商品资料,所有分公司共享
+	 * 修改 基础资料-商品资料
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,18 +110,18 @@ public class BCommodityController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-商品资料,所有分公司共享
+	 * 新增或修改 基础资料-商品资料
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入bCommodity")
 	public R submit(@Valid @RequestBody BCommodity bCommodity) {
-		return R.status(bCommodityService.saveOrUpdate(bCommodity));
+		return bCommodityService.submit(bCommodity);
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-商品资料,所有分公司共享
+	 * 删除 基础资料-商品资料
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +130,5 @@ public class BCommodityController extends BladeController {
 		return R.status(bCommodityService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/mapper/BCommodityMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-商品资料,所有分公司共享 Mapper 接口
+ * 基础资料-商品资料 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 8 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/service/IBCommodityService.java

@@ -16,13 +16,14 @@
  */
 package org.springblade.los.basic.commodity.service;
 
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.commodity.entity.BCommodity;
 import org.springblade.los.basic.commodity.vo.BCommodityVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-商品资料,所有分公司共享 服务类
+ * 基础资料-商品资料 服务类
  *
  * @author BladeX
  * @since 2023-10-07
@@ -38,4 +39,10 @@ public interface IBCommodityService extends IService<BCommodity> {
 	 */
 	IPage<BCommodityVO> selectBCommodityPage(IPage<BCommodityVO> page, BCommodityVO bCommodity);
 
+	/**
+	 * 新增或修改 基础资料-商品资料
+	 * @param bCommodity
+	 * @return
+	 */
+    R submit(BCommodity bCommodity);
 }

+ 38 - 4
blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/service/impl/BCommodityServiceImpl.java

@@ -16,26 +16,60 @@
  */
 package org.springblade.los.basic.commodity.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.commodity.entity.BCommodity;
-import org.springblade.los.basic.commodity.vo.BCommodityVO;
 import org.springblade.los.basic.commodity.mapper.BCommodityMapper;
 import org.springblade.los.basic.commodity.service.IBCommodityService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.los.basic.commodity.vo.BCommodityVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * 基础资料-商品资料,所有分公司共享 服务实现类
+ * 基础资料-商品资料 服务实现类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Service
+@AllArgsConstructor
 public class BCommodityServiceImpl extends ServiceImpl<BCommodityMapper, BCommodity> implements IBCommodityService {
 
+
+	private final ISysClient sysClient;
+
 	@Override
 	public IPage<BCommodityVO> selectBCommodityPage(IPage<BCommodityVO> page, BCommodityVO bCommodity) {
 		return page.setRecords(baseMapper.selectBCommodityPage(page, bCommodity));
 	}
 
+	@Override
+	public R submit(BCommodity bCommodity) {
+		if (bCommodity.getId() == null) {
+			bCommodity.setCreateTime(new Date());
+			bCommodity.setCreateUser(AuthUtil.getUserId());
+			bCommodity.setCreateUserName(AuthUtil.getUserName());
+			//获取部门ids对应中文名
+			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+				bCommodity.setCreateDept(AuthUtil.getDeptId());
+				R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
+				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+					bCommodity.setCreateDeptName(String.join(",", res.getData()));
+				}
+			}
+		} else {
+			bCommodity.setUpdateUser(AuthUtil.getUserId());
+			bCommodity.setUpdateUserName(AuthUtil.getUserName());
+		}
+		this.saveOrUpdate(bCommodity);
+		return R.data(bCommodity);
+	}
+
 }

+ 12 - 11
blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/controller/BCountrysController.java

@@ -27,6 +27,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.countrys.entity.BCountrys;
@@ -35,7 +36,7 @@ import org.springblade.los.basic.countrys.service.IBCountrysService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 基础资料-国家或地区,所有分公司共享 控制器
+ * 基础资料-国家或地区 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,7 +44,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bcountrys")
-@Api(value = "基础资料-国家或地区,所有分公司共享", tags = "基础资料-国家或地区,所有分公司共享接口")
+@Api(value = "基础资料-国家或地区", tags = "基础资料-国家或地区接口")
 public class BCountrysController extends BladeController {
 
 	private final IBCountrysService bCountrysService;
@@ -60,7 +61,7 @@ public class BCountrysController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-国家或地区,所有分公司共享
+	 * 分页 基础资料-国家或地区
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +72,7 @@ public class BCountrysController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-国家或地区,所有分公司共享
+	 * 自定义分页 基础资料-国家或地区
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +83,7 @@ public class BCountrysController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-国家或地区,所有分公司共享
+	 * 新增 基础资料-国家或地区
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +93,7 @@ public class BCountrysController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-国家或地区,所有分公司共享
+	 * 修改 基础资料-国家或地区
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,18 +103,18 @@ public class BCountrysController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-国家或地区,所有分公司共享
+	 * 新增或修改 基础资料-国家或地区
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入bCountrys")
 	public R submit(@Valid @RequestBody BCountrys bCountrys) {
-		return R.status(bCountrysService.saveOrUpdate(bCountrys));
+		return bCountrysService.submit(bCountrys);
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-国家或地区,所有分公司共享
+	 * 删除 基础资料-国家或地区
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +123,5 @@ public class BCountrysController extends BladeController {
 		return R.status(bCountrysService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/mapper/BCountrysMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-国家或地区,所有分公司共享 Mapper 接口
+ * 基础资料-国家或地区 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 8 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/service/IBCountrysService.java

@@ -16,13 +16,14 @@
  */
 package org.springblade.los.basic.countrys.service;
 
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.countrys.entity.BCountrys;
 import org.springblade.los.basic.countrys.vo.BCountrysVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-国家或地区,所有分公司共享 服务类
+ * 基础资料-国家或地区 服务类
  *
  * @author BladeX
  * @since 2023-10-07
@@ -38,4 +39,10 @@ public interface IBCountrysService extends IService<BCountrys> {
 	 */
 	IPage<BCountrysVO> selectBCountrysPage(IPage<BCountrysVO> page, BCountrysVO bCountrys);
 
+	/**
+	 * 新增或修改 基础资料-国家或地区
+	 * @param bCountrys
+	 * @return
+	 */
+	R submit(BCountrys bCountrys);
 }

+ 38 - 4
blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/service/impl/BCountrysServiceImpl.java

@@ -16,26 +16,60 @@
  */
 package org.springblade.los.basic.countrys.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.countrys.entity.BCountrys;
-import org.springblade.los.basic.countrys.vo.BCountrysVO;
 import org.springblade.los.basic.countrys.mapper.BCountrysMapper;
 import org.springblade.los.basic.countrys.service.IBCountrysService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.los.basic.countrys.vo.BCountrysVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.Date;
+import java.util.List;
 
 /**
- * 基础资料-国家或地区,所有分公司共享 服务实现类
+ * 基础资料-国家或地区 服务实现类
  *
  * @author BladeX
  * @since 2023-10-07
  */
 @Service
+@AllArgsConstructor
 public class BCountrysServiceImpl extends ServiceImpl<BCountrysMapper, BCountrys> implements IBCountrysService {
 
+
+	private final ISysClient sysClient;
+
 	@Override
 	public IPage<BCountrysVO> selectBCountrysPage(IPage<BCountrysVO> page, BCountrysVO bCountrys) {
 		return page.setRecords(baseMapper.selectBCountrysPage(page, bCountrys));
 	}
 
+	@Override
+	public R submit(BCountrys bCountrys) {
+		if (bCountrys.getId() == null) {
+			bCountrys.setCreateTime(new Date());
+			bCountrys.setCreateUser(AuthUtil.getUserId());
+			bCountrys.setCreateUserName(AuthUtil.getUserName());
+			//获取部门ids对应中文名
+			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+				bCountrys.setCreateDept(AuthUtil.getDeptId());
+				R<List<String>> res = sysClient.getDeptNames(AuthUtil.getDeptId());
+				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+					bCountrys.setCreateDeptName(String.join(",", res.getData()));
+				}
+			}
+		} else {
+			bCountrys.setUpdateUser(AuthUtil.getUserId());
+			bCountrys.setUpdateUserName(AuthUtil.getUserName());
+		}
+		this.saveOrUpdate(bCountrys);
+		return R.data(bCountrys);
+	}
+
 }

+ 10 - 10
blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/controller/BCurExrateController.java

@@ -35,7 +35,7 @@ import org.springblade.los.basic.cur.service.IBCurExrateService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 基础资料-币种汇率,所有分公司共享 控制器
+ * 基础资料-币种汇率 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bcurexrate")
-@Api(value = "基础资料-币种汇率,所有分公司共享", tags = "基础资料-币种汇率,所有分公司共享接口")
+@Api(value = "基础资料-币种汇率", tags = "基础资料-币种汇率接口")
 public class BCurExrateController extends BladeController {
 
 	private final IBCurExrateService bCurExrateService;
@@ -60,7 +60,7 @@ public class BCurExrateController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-币种汇率,所有分公司共享
+	 * 分页 基础资料-币种汇率
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +71,7 @@ public class BCurExrateController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-币种汇率,所有分公司共享
+	 * 自定义分页 基础资料-币种汇率
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +82,7 @@ public class BCurExrateController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-币种汇率,所有分公司共享
+	 * 新增 基础资料-币种汇率
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +92,7 @@ public class BCurExrateController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-币种汇率,所有分公司共享
+	 * 修改 基础资料-币种汇率
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,7 +102,7 @@ public class BCurExrateController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-币种汇率,所有分公司共享
+	 * 新增或修改 基础资料-币种汇率
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -111,9 +111,9 @@ public class BCurExrateController extends BladeController {
 		return R.status(bCurExrateService.saveOrUpdate(bCurExrate));
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-币种汇率,所有分公司共享
+	 * 删除 基础资料-币种汇率
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +122,5 @@ public class BCurExrateController extends BladeController {
 		return R.status(bCurExrateService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 10 - 10
blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/controller/BCurrencyController.java

@@ -35,7 +35,7 @@ import org.springblade.los.basic.cur.service.IBCurrencyService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 /**
- * 基础资料-币种,所有分公司共享 控制器
+ * 基础资料-币种 控制器
  *
  * @author BladeX
  * @since 2023-10-07
@@ -43,7 +43,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/bcurrency")
-@Api(value = "基础资料-币种,所有分公司共享", tags = "基础资料-币种,所有分公司共享接口")
+@Api(value = "基础资料-币种", tags = "基础资料-币种接口")
 public class BCurrencyController extends BladeController {
 
 	private final IBCurrencyService bCurrencyService;
@@ -60,7 +60,7 @@ public class BCurrencyController extends BladeController {
 	}
 
 	/**
-	 * 分页 基础资料-币种,所有分公司共享
+	 * 分页 基础资料-币种
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -71,7 +71,7 @@ public class BCurrencyController extends BladeController {
 	}
 
 	/**
-	 * 自定义分页 基础资料-币种,所有分公司共享
+	 * 自定义分页 基础资料-币种
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -82,7 +82,7 @@ public class BCurrencyController extends BladeController {
 	}
 
 	/**
-	 * 新增 基础资料-币种,所有分公司共享
+	 * 新增 基础资料-币种
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -92,7 +92,7 @@ public class BCurrencyController extends BladeController {
 	}
 
 	/**
-	 * 修改 基础资料-币种,所有分公司共享
+	 * 修改 基础资料-币种
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -102,7 +102,7 @@ public class BCurrencyController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 基础资料-币种,所有分公司共享
+	 * 新增或修改 基础资料-币种
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -111,9 +111,9 @@ public class BCurrencyController extends BladeController {
 		return R.status(bCurrencyService.saveOrUpdate(bCurrency));
 	}
 
-	
+
 	/**
-	 * 删除 基础资料-币种,所有分公司共享
+	 * 删除 基础资料-币种
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 8)
@@ -122,5 +122,5 @@ public class BCurrencyController extends BladeController {
 		return R.status(bCurrencyService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+
 }

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/mapper/BCurExrateMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-币种汇率,所有分公司共享 Mapper 接口
+ * 基础资料-币种汇率 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/mapper/BCurrencyMapper.java

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
- * 基础资料-币种,所有分公司共享 Mapper 接口
+ * 基础资料-币种 Mapper 接口
  *
  * @author BladeX
  * @since 2023-10-07

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/IBCurExrateService.java

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
- * 基础资料-币种汇率,所有分公司共享 服务类
+ * 基础资料-币种汇率 服务类
  *
  * @author BladeX
  * @since 2023-10-07

Some files were not shown because too many files changed in this diff