Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/req/auth/AuthPermissionRuleSaveRequest.java

@@ -1,5 +1,7 @@
 package com.glxp.api.req.auth;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -8,15 +10,23 @@ import javax.validation.constraints.NotEmpty;
  * 权限规则的提交保存表单
  */
 @Data
+@ApiModel(value = "权限规则的提交保存表单")
 public class AuthPermissionRuleSaveRequest {
+    @ApiModelProperty(value = "主键")
     private Long id;
+    @ApiModelProperty(value = "pid")
     private Long pid;
+    @ApiModelProperty(value = "名称")
     @NotEmpty(message = "请输入规则名称")
     private String name;
+    @ApiModelProperty(value = "标题")
     @NotEmpty(message = "请输入规则标题")
     private String title;
+    @ApiModelProperty(value = "状态")
     private Integer status;
+    @ApiModelProperty(value = "条件")
     private String condition;
+    @ApiModelProperty(value = "列表顺序")
     private Integer listorder;
 
 }

src/main/java/com/glxp/api/req/auth/AuthRoleAuthRequest.java

@@ -1,5 +1,7 @@
 package com.glxp.api.req.auth;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -9,10 +11,13 @@ import java.util.List;
 /**
  * 角色的授权提交表单
  */
+@ApiModel(value = "角色的授权提交表单")
 @Data
 public class AuthRoleAuthRequest {
+    @ApiModelProperty(value = "角色ID")
     @NotNull(message = "请选择角色")
     private Long role_id;
+    @ApiModelProperty(value = "权限规则")
     @NotEmpty(message = "请选择授权的权限规则")
     private List<Long> auth_rules;
 }

src/main/java/com/glxp/api/req/auth/AuthRoleSaveRequest.java

@@ -1,16 +1,25 @@
 package com.glxp.api.req.auth;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * 角色的提交保存表单
  */
+@ApiModel(value = "角色的提交保存表单")
 @Data
 public class AuthRoleSaveRequest {
+    @ApiModelProperty(value = "主键")
     private Long id;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "pid")
     private Long pid;
+    @ApiModelProperty(value = "状态")
     private Long status;
+    @ApiModelProperty(value = "备注")
     private String remark;
+    @ApiModelProperty(value = "列表顺序")
     private Long listorder;
 }

src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 public class AuthUserSaveRequest {
     // id
-    @ApiModelProperty(value = "id")
+    @ApiModelProperty(value = "主键")
     private Long id;
     // 昵称
     @ApiModelProperty(value = "昵称")

src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java

@@ -1,40 +1,61 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("管理员的提交保存表单请求类")
 @Data
 public class BussinessTypeFilterRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "启用")
     private Boolean enable;
+    @ApiModelProperty(value = "行动")
     private String action;
+    @ApiModelProperty(value = "第三个动作")
     private String thirdAction;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "主要操作")
     private String mainAction;
+    @ApiModelProperty(value = "已启用")
     private Boolean enabled;
+    @ApiModelProperty(value = "检查启用状态")
     private Boolean checkEnable;
+    @ApiModelProperty(value = "预付款类型")
     private Boolean advanceType;
+    @ApiModelProperty(value = "类型")
     private String type;
+    @ApiModelProperty(value = "索引")
     private Integer index;
-
+    @ApiModelProperty(value = "运费特殊政策使用状态")
     private Boolean spUse;
+    @ApiModelProperty(value = "本地操作")
     private String localAction;
+    @ApiModelProperty(value = "安全检查启用状态")
     private Boolean secCheckEnable;
-
+    @ApiModelProperty(value = "过滤操作")
     private String filterAction;
+    @ApiModelProperty(value = "用户ID")
     private Integer userId;
-
+    @ApiModelProperty(value = "库存组织代码")
     private String locInvCode;
+    @ApiModelProperty(value = "子库存代码")
     private String locSubInvCode;
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "编码")
     private String code;
+    @ApiModelProperty(value = "ID列表")
     private String ids;
+    @ApiModelProperty(value = "操作列表")
     private List<String> actionList;
+    @ApiModelProperty(value = "预入库")
     private Boolean preIn;
-
+    @ApiModelProperty(value = "有效派送")
     private boolean vailDispatch;
+    @ApiModelProperty(value = "有效团购")
     private int vailGroupBuy;
 
 }

src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java

@@ -1,33 +1,40 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.List;
-
+@ApiModel("过滤认证用户请求")
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class FilterAuthUserRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "用户名称")
     private String userName;
-
+    @ApiModelProperty(value = "用户标识")
     private Integer userFlag;
-
+    @ApiModelProperty(value = "角色ID")
     private Long roleId;
-
+    @ApiModelProperty(value = "标识符")
     private List<Long> ids;
-
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "员工姓名")
     private String employeeName;
 
     //用户名 !=
+    @ApiModelProperty(value = "网络设备用户名")
     private String neUserName;
 
     /**
      * 部门编码
      */
+    @ApiModelProperty(value = "部门编码")
     private String deptCode;
+    @ApiModelProperty(value = "仓库号")
     private String invCode;     //仓库号
+    @ApiModelProperty(value = "密钥")
     private String key;
 }

src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java

@@ -1,15 +1,23 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "权限规则的提交保存表单")
 @Data
 public class FilterDeptRequest extends ListPageRequest {
+    @ApiModelProperty(value = "编码")
     private String code;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "标志")
     private Integer flag;
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "父级ID")
     private Integer parentId;
+    @ApiModelProperty(value = "主键")
     private Integer id;
 
 }

src/main/java/com/glxp/api/req/auth/FilterInvBusTypeRequest.java

@@ -1,12 +1,19 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel(value = "过滤无效业务类型请求")
 public class FilterInvBusTypeRequest extends ListPageRequest {
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "主键")
     private Integer id;
+    @ApiModelProperty(value = "编码")
     private String code;
+    @ApiModelProperty(value = "行动")
     private String action;
 }

src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java

@@ -1,17 +1,21 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel(value = "过滤无效业务用户请求")
 @Data
 public class FilterInvBusUserRequest extends ListPageRequest {
 
-
+    @ApiModelProperty(value = "用户id")
     private String userId;
+    @ApiModelProperty(value = "子库存编码")
     private String subInvCode;
+    @ApiModelProperty(value = "供应链动作")
     private String scAction;
-
+    @ApiModelProperty(value = "已选编码")
     private List<String> selectedCodes;
 }

src/main/java/com/glxp/api/req/auth/FilterInvSpaceRequest.java

@@ -1,52 +1,62 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * 货位查询参数
  */
+@ApiModel(value = "货位查询参数")
 @Data
 public class FilterInvSpaceRequest extends ListPageRequest {
 
     /**
      * 客户ID
      */
+    @ApiModelProperty(value = "客户ID")
     private String customerId;
 
     /**
      * 分库编码
      */
+    @ApiModelProperty(value = "分库编码")
     private String invWarehouseCode;
 
     /**
      * 仓库编码
      */
+    @ApiModelProperty(value = "仓库编码")
     private String invStorageCode;
 
     /**
      * 查询关键字，匹配货位码和名称
      */
+    @ApiModelProperty(value = "查询关键字，匹配货位码和名称")
     private String key;
 
     /**
      * 货位码
      */
+    @ApiModelProperty(value = "货位码")
     private String code;
 
     /**
      * 货位名称
      */
+    @ApiModelProperty(value = "货位名称")
     private String name;
 
     /**
      * 状态
      */
+    @ApiModelProperty(value = "状态")
     private Boolean status;
 
     /**
      * 备注
-     */
+     */@ApiModelProperty(value = "备注")
     private String remark;
 
 }

src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java

@@ -1,24 +1,37 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤库存子仓库请求")
 @Data
 public class FilterInvSubWarehouseRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private String id;
+    @ApiModelProperty(value = "编码")
     private String code;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "父级ID")
     private String parentId;
+    @ApiModelProperty(value = "默认库存")
     private Boolean defaultInv;
+    @ApiModelProperty(value = "高级筛选类型")
     private Integer advanceType;
-
+    @ApiModelProperty(value = "第三方ID")
     public String thirdId;
+    @ApiModelProperty(value = "第三方ID1")
     public String thirdId1;
+    @ApiModelProperty(value = "第三方ID2")
     public String thirdId2;
+    @ApiModelProperty(value = "第三方ID3")
     public String thirdId3;
+    @ApiModelProperty(value = "第三方ID4")
     public String thirdId4;
 
+    @ApiModelProperty(value = "密钥")
     private String key;
+    @ApiModelProperty(value = "高级筛选类型")
     private Integer filterAdvanceType;
 }

src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java

@@ -1,15 +1,22 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤库存用户请求")
 @Data
 public class FilterInvUserRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private Long id;
+    @ApiModelProperty(value = "编码")
     private String code;
+    @ApiModelProperty(value = "用户id")
     private Long userid;
+    @ApiModelProperty(value = "用户名称")
     private String username;
+    @ApiModelProperty(value = "是否为主管")
     private Boolean isDirector;
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
 }

src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java

@@ -1,91 +1,108 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤菜单请求")
 @Data
 public class FilterMenuRequest extends ListPageRequest {
 
-
+    @ApiModelProperty(value = "父菜单名称")
     private String parentName;
 
     /**
      * 父菜单ID
      */
+    @ApiModelProperty(value = "父菜单ID")
     private Long parentId;
 
 
     /**
      * 菜单ID
      */
+    @ApiModelProperty(value = "菜单ID")
     private Long menuId;
 
     /**
      * 菜单名称
      */
+    @ApiModelProperty(value = "菜单名称")
     private String menuName;
 
     /**
      * 显示顺序
      */
+    @ApiModelProperty(value = "显示顺序")
     private Integer orderNum;
 
     /**
      * 路由地址
      */
+    @ApiModelProperty(value = "路由地址")
     private String path;
 
     /**
      * 组件路径
      */
+    @ApiModelProperty(value = "组件路径")
     private String component;
 
     /**
      * 路由参数
      */
+    @ApiModelProperty(value = "路由参数")
     private String queryParam;
 
     /**
      * 是否为外链（0是 1否）
      */
+    @ApiModelProperty(value = "是否为外链（0是 1否）")
     private String isFrame;
 
     /**
      * 是否缓存（0缓存 1不缓存）
      */
+    @ApiModelProperty(value = "是否缓存（0缓存 1不缓存）")
     private String isCache;
 
     /**
      * 类型（M目录 C菜单 F按钮）
      */
+    @ApiModelProperty(value = "类型（M目录 C菜单 F按钮）")
     private String menuType;
 
     /**
      * 显示状态（0显示 1隐藏）
      */
+    @ApiModelProperty(value = "显示状态（0显示 1隐藏）")
     private String visible;
 
     /**
      * 菜单状态（0正常 1停用）
      */
+    @ApiModelProperty(value = "菜单状态（0正常 1停用）")
     private String status;
 
     /**
      * 权限字符串
      */
+    @ApiModelProperty(value = "权限字符串")
     private String perms;
 
     /**
      * 菜单图标
      */
+    @ApiModelProperty(value = "菜单图标")
     private String icon;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-
+    @ApiModelProperty(value = "不等于菜单ID")
     private String neMenuId;
 
 }

src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java

@@ -1,14 +1,17 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel(value = "过滤未选择用户请求")
 @Data
 public class FilterNoSelectUserRequest extends ListPageRequest {
 
-
+    @ApiModelProperty(value = "用户id")
     List<Long> userIds;
+    @ApiModelProperty(value = "部门ID")
     private Long deptId;
 }

src/main/java/com/glxp/api/req/auth/FilterRoleMenuRequest.java

@@ -1,8 +1,10 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤角色菜单请求")
 @Data
 public class FilterRoleMenuRequest extends ListPageRequest {
 
@@ -10,10 +12,12 @@ public class FilterRoleMenuRequest extends ListPageRequest {
     /**
      * 角色ID
      */
+    @ApiModelProperty(value = "角色ID")
     private Long roleId;
 
     /**
      * 菜单ID
      */
+    @ApiModelProperty(value = "菜单ID")
     private Long menuId;
 }

src/main/java/com/glxp/api/req/auth/FilterRoleRequest.java

@@ -1,17 +1,25 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤角色请求")
 @Data
 public class FilterRoleRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "角色id")
     private Long roleId;
+    @ApiModelProperty(value = "角色名称")
     private String roleName;
+    @ApiModelProperty(value = "角色键值")
     private String roleKey;
+    @ApiModelProperty(value = "状态")
     private String status;
+    @ApiModelProperty(value = "不等于角色名称")
     private String neRoleName;
+    @ApiModelProperty(value = "不等于角色键值")
     private String neRoleKey;
+    @ApiModelProperty(value = "不等于角色ID")
     private Long neRoleId;
 
 }

src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java

@@ -1,18 +1,23 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤系统历史状态请求")
 @Data
 public class FilterSysHisStatusRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private Integer id;
+    @ApiModelProperty(value = "类型")
     private String type;
+    @ApiModelProperty(value = "类型名称")
     private String typeName;
+    @ApiModelProperty(value = "父级id")
     private Integer parentId;
+    @ApiModelProperty(value = "状态")
     private Integer status;
-
-
+    @ApiModelProperty(value = "部门ID")
     private Integer deptId;
 
 }

src/main/java/com/glxp/api/req/auth/FilterUserRoleRequest.java

@@ -1,12 +1,15 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "过滤用户角色请求")
 @Data
 public class FilterUserRoleRequest extends ListPageRequest {
 
-
+    @ApiModelProperty(value = "用户id")
     private Long userId;
+    @ApiModelProperty(value = "角色id")
     private Long roleId;
 }

src/main/java/com/glxp/api/req/auth/UpdateInvRelBusRequest.java

@@ -1,13 +1,16 @@
 package com.glxp.api.req.auth;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel(value = "更新邀请关系业务请求")
 @Data
 public class UpdateInvRelBusRequest {
-
+    @ApiModelProperty(value = "邀请码")
     private String invCode;
+    @ApiModelProperty(value = "选择操作")
     private List<String> selectActions;
 
 

src/main/java/com/glxp/api/req/auth/UpdatePasswordRequest.java

@@ -1,5 +1,7 @@
 package com.glxp.api.req.auth;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -9,14 +11,15 @@ import javax.validation.constraints.NotNull;
  * 修改密码的表单
  */
 @Data
+@ApiModel(value = "修改密码的表单")
 public class UpdatePasswordRequest {
-
+    @ApiModelProperty(value = "管理员ID")
     @NotNull(message = "参数错误！")
     private Long adminId;
-
+    @ApiModelProperty(value = "旧密码")
     @NotEmpty(message = "请输入旧密码")
     private String oldPassword;
-
+    @ApiModelProperty(value = "新密码")
     @NotEmpty(message = "请输入新密码")
     private String newPassword;
 

src/main/java/com/glxp/api/req/auth/UpdateUserRelBusRequset.java

@@ -1,15 +1,21 @@
 package com.glxp.api.req.auth;
 
 import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel(value = "更新用户关系业务请求")
 @Data
 public class UpdateUserRelBusRequset {
+    @ApiModelProperty(value = "用户id")
     private String userId;
+    @ApiModelProperty(value = "下级邀请码")
     private String subInvCode;
+    @ApiModelProperty(value = "选择操作")
     private List<String> selectActions;
+    @ApiModelProperty(value = "邀请关系业务用户实体")
     private List<WarehouseBussinessTypeEntity> invBusUserEntities;
 
 

src/main/java/com/glxp/api/req/auth/UserCertFilterRequest.java

@@ -2,16 +2,26 @@ package com.glxp.api.req.auth;
 
 import com.glxp.api.util.page.ListPageRequest;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "用户证书过滤请求")
 @Data
 public class UserCertFilterRequest extends ListPageRequest {
+    @ApiModelProperty(value = "注册ID")
     private String registerId;
+    @ApiModelProperty(value = "公司ID")
     private String companyId;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "编码")
     private String code;
+    @ApiModelProperty(value = "检查状态")
     private String checkStatus;
+    @ApiModelProperty(value = "注册时间")
     private String registerTime;
+    @ApiModelProperty(value = "检查时间")
     private String checkTime;
+    @ApiModelProperty(value = "状态")
     private String status;
 }

src/main/java/com/glxp/api/req/auth/UserRegisterFilterRequest.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class UserRegisterFilterRequest extends ListPageRequest {
 
-    @ApiModelProperty(value = "id")
+    @ApiModelProperty(value = "主键")
     private String id;
 
     @ApiModelProperty(value = "注册人ID")

src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java

@@ -1,16 +1,24 @@
 package com.glxp.api.req.basic;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("基本公司导出请求")
 @Data
 public class BasicCorpsExportRequest {
+    @ApiModelProperty(value = "ID列表")
     List<Long> ids;
+    @ApiModelProperty(value = "主键")
     private Integer id;
+    @ApiModelProperty(value = "密钥")
     private String key;
+    @ApiModelProperty(value = "单位ID")
     private String unitId;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "第三方系统")
     private String thirdSys;
 
 }

src/main/java/com/glxp/api/req/basic/BasicEntrustRecRequest.java

@@ -1,23 +1,35 @@
 package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-
+@ApiModel("基本委托记录请求")
 @Data
 public class BasicEntrustRecRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private Integer id;
+    @ApiModelProperty(value = "行为")
     private String action;
+    @ApiModelProperty(value = "委托编号")
     private String entrustInv;
+    @ApiModelProperty(value = "委托部门")
     private String entrustDept;
+    @ApiModelProperty(value = "委托用户")
     private Long entrustUser;
+    @ApiModelProperty(value = "用户id")
     private String userId;
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+    @ApiModelProperty(value = "当前持仓编号")
     private String curInv;
+    @ApiModelProperty(value = "当前持仓部门")
     private String curDept;
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "名称")
     private String name;
 
 }

src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java

@@ -2,14 +2,18 @@ package com.glxp.api.req.basic;
 
 import com.glxp.api.res.basic.BasicErpUnitsResponse;
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("基本医院类型过滤请求")
 @Data
 public class BasicHospTypeFilterRequest extends ListPageRequest {
-
+  @ApiModelProperty(value = "名称")
   private String name;
+  @ApiModelProperty(value = "类型")
   private Integer type;
+  @ApiModelProperty(value = "编码")
   private String code;
 }

src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java

@@ -2,17 +2,24 @@ package com.glxp.api.req.basic;
 
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("基本医院类型请求")
 @Data
 public class BasicHospTypeRequest{
-
+  @ApiModelProperty(value = "主键")
   private  Long id;
+  @ApiModelProperty(value = "编码")
   private  String code;
+  @ApiModelProperty(value = "父级代码")
   private  String parentCode;
+  @ApiModelProperty(value = "名称")
   private  String name;
+  @ApiModelProperty(value = "备注")
   private String remark;
+  @ApiModelProperty(value = "标识符")
   List<String> ids;
 }

src/main/java/com/glxp/api/req/basic/BasicStockOrderPrintRequest.java

@@ -2,51 +2,82 @@ package com.glxp.api.req.basic;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-
+@ApiModel("基础库存订单打印请求")
 @Data
 public class BasicStockOrderPrintRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private String id;
+    @ApiModelProperty(value = "账单号")
     private String billNo;
+    @ApiModelProperty(value = "账单时间")
     private String billdate;
+    @ApiModelProperty(value = "公司编号")
     private String corpId;
+    @ApiModelProperty(value = "公司名称")
     private String corpName;
+    @ApiModelProperty(value = "账单类型")
     private String billType;
+    @ApiModelProperty(value = "账单操作")
     private String billAction;
+    @ApiModelProperty(value = "账单标识")
     private String billFlag;
+    @ApiModelProperty(value = "第三方系统外键")
     private String thirdSysFk;
+    @ApiModelProperty(value = "状态")
     private String status;
+    @ApiModelProperty(value = "状态信息")
     private String statusInfo;
+    @ApiModelProperty(value = "类型")
     private String type;
+    @ApiModelProperty(value = "来源类型")
     private String sourceType;
+    @ApiModelProperty(value = "打印状态")
     private String printStatus;
+    @ApiModelProperty(value = "单元 ID 外键")
     private String unitIdFk;
+    @ApiModelProperty(value = "客户 ID")
     private String customerId;
+    @ApiModelProperty(value = "起始日期")
     private String startTime;  //起始日期
+    @ApiModelProperty(value = "结束日期")
     private String endTime;       //结束日期
+    @ApiModelProperty(value = "第三方订单外键")
     private String thirdOrderFk;
+    @ApiModelProperty(value = "订单 ID 外键")
     private String orderIdFk;
+    @ApiModelProperty(value = "总价")
     private BigDecimal totalPrice;
+    @ApiModelProperty(value = "库位编码")
     private String locStorageCode;
+    @ApiModelProperty(value = "调入仓库编码")
     private String invWarehouseCode;
+    @ApiModelProperty(value = "创建用户")
     private Integer createUser;
+    @ApiModelProperty(value = "审核用户")
     private Integer reviewUser;
+    @ApiModelProperty(value = "用户id")
     private Integer userId;
+    @ApiModelProperty(value = "联合用户")
     private Integer unionUser;
+    @ApiModelProperty(value = "委托用户")
     private String entrustUser;
+    @ApiModelProperty(value = "委托结束时间")
     private boolean entrustEnd;
+    @ApiModelProperty(value = "本地操作")
     private String localAction;
-
+    @ApiModelProperty(value = "订单编号")
     private String orderId;
-
+    @ApiModelProperty(value = "开始日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String startDate;
-
+    @ApiModelProperty(value = "结束日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String endDate;
-
+    @ApiModelProperty(value = "过滤器未选择")
     private Boolean filterNoSelect;
 }

src/main/java/com/glxp/api/req/basic/BasicUdiBatchRelRequest.java

@@ -3,11 +3,12 @@ package com.glxp.api.req.basic;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-
+@ApiModel("基本 UDI 批量关联请求")
 @Data
 public class BasicUdiBatchRelRequest {
 

src/main/java/com/glxp/api/req/basic/BasicUdiProductRequest.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @ApiModel("UDI医疗器械信息字典请求类")
 public class BasicUdiProductRequest extends ListPageRequest {
 
-    @ApiModelProperty(value = "id")
+    @ApiModelProperty(value = "主键")
     private Long id;
 
     /**

src/main/java/com/glxp/api/req/basic/BasicUdiRelRequest.java

@@ -2,38 +2,45 @@ package com.glxp.api.req.basic;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-
+@ApiModel("基本 UDI 关联请求")
 @Data
 public class BasicUdiRelRequest {
-
+    @ApiModelProperty(value = "主键")
     private Long id;
 
     /**
      * 国家库uuid
      */
+    @ApiModelProperty(value = "国家库uuid")
     private String uuid;
 
     /**
      * 企业信息ID外键
      */
+    @ApiModelProperty(value = "企业信息ID外键")
     private Long companyIdFk;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 更新人
      */
+    @ApiModelProperty(value = "更新人")
     private String updateUser;
 
 //    -------------企业自定义设置------------------------
@@ -41,17 +48,23 @@ public class BasicUdiRelRequest {
     /**
      * 生产数据对接方（1.生产企业/2.代理商/3.购买方）
      */
+    @ApiModelProperty(value = "生产数据对接方（1.生产企业/2.代理商/3.购买方）")
     private Integer companyType;
-
+    @ApiModelProperty(value = "代理开始日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date agengtStartDate;
+    @ApiModelProperty(value = "代理结束日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date agengtEndDate;
 
 
     //    器械字典设置
+    @ApiModelProperty(value = "器械字典设置")
     private String manufactory;
+    @ApiModelProperty(value = "测量名称")
     private String measname;
+    @ApiModelProperty(value = "商品名称")
     private String spmc;
 
+
 }

src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java

@@ -2,29 +2,47 @@ package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
 import com.glxp.api.res.basic.BasicErpUnitsResponse;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("基本单位维护过滤请求")
 @Data
 public class BasicUnitMaintainFilterRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private Long id;
+    @ApiModelProperty(value = "密钥")
     private String key;
+    @ApiModelProperty(value = "单位 ID")
     private String unitId;
+    @ApiModelProperty(value = "名称")
     private String name;
+    @ApiModelProperty(value = "第三方系统")
     private String thirdSys;
+    @ApiModelProperty(value = "第三方系统外键")
     private String thirdSysFk;
+    @ApiModelProperty(value = "第三方系统 ID")
 
     private String thirdId;
+    @ApiModelProperty(value = "第三方系统 ID1")
     private String thirdId1;
+    @ApiModelProperty(value = "第三方系统 ID2")
     private String thirdId2;
+    @ApiModelProperty(value = "第三方系统 ID3")
     private String thirdId3;
+    @ApiModelProperty(value = "第三方系统 ID4")
     private String thirdId4;
+    @ApiModelProperty(value = "ERP 系统 ID")
     private String erpId;
+    @ApiModelProperty(value = "公司类型")
     private Integer corpType;
+    @ApiModelProperty(value = "产出物类型")
     private Integer outType;
+    @ApiModelProperty(value = "是否为第三方系统")
     private Boolean isDownThrSys;
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "第三方公司实体")
     List<BasicErpUnitsResponse>thrCorpEntities;
 }

src/main/java/com/glxp/api/req/basic/BusNoUserRequest.java

@@ -1,10 +1,12 @@
 package com.glxp.api.req.basic;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel("号码用户请求")
 @Data
 public class BusNoUserRequest {
-
+    @ApiModelProperty(value = "当前操作")
     private String curAction;
 
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -1,6 +1,8 @@
 package com.glxp.api.req.basic;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -10,15 +12,16 @@ import java.util.Date;
 /**
  * 添加单据类型请求参数
  */
+@ApiModel("添加单据类型请求参数")
 @Data
 public class BussinessTypeSaveRequest {
-
+    @ApiModelProperty(value = "主键")
 
     /**
      * id
      */
     private Long id;
-
+    @ApiModelProperty(value = "主类型（出库，入库）")
     /**
      * 主类型（出库，入库）
      */
@@ -28,279 +31,347 @@ public class BussinessTypeSaveRequest {
     /**
      * 业务类型
      */
+    @ApiModelProperty(value = "业务类型")
     private String action;
 
     /**
      * 业务名称
      */
+    @ApiModelProperty(value = "业务名称")
     @NotBlank(message = "请输入单据类型名称")
     private String name;
 
     /**
      * 是否启用, 0：未启用  1：启用
      */
+    @ApiModelProperty(value = "是否启用, 0：未启用  1：启用")
     private Boolean enable;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 第三方系统外键
      */
+    @ApiModelProperty(value = "第三方系统外键")
     private String thirdSysFk;
 
     /**
      * 是否自动生成往来单位：1.是；2.否
      */
+    @ApiModelProperty(value = "是否自动生成往来单位：1.是；2.否")
     private boolean genUnit;
 
     /**
      * 是否是内部单据：1.是；0：否
      */
+    @ApiModelProperty(value = "是否是内部单据：1.是；0：否")
     private Boolean innerOrder;
 
     /**
      * 是否二次验收
      */
+    @ApiModelProperty(value = "是否二次验收")
     private Boolean secCheckEnable;
 
     /**
      * 是否根据业务单据类型校验
      */
+    @ApiModelProperty(value = "是否根据业务单据类型校验")
     private Boolean checkEnable;
 
     /**
      * UDIMS平台来源是否需要校验
      */
+    @ApiModelProperty(value = "UDIMS平台来源是否需要校验")
     private Integer checkUdims;
 
     /**
      * pda已校验单据
      */
+    @ApiModelProperty(value = "pda已校验单据")
     private Integer checkPdaEd;
 
     /**
      * pda未检验单据
      */
+    @ApiModelProperty(value = "pda未检验单据")
     private Integer checkPdaUn;
 
     /**
      * PC端扫码精灵
      */
+    @ApiModelProperty(value = "PC端扫码精灵")
     private Integer checkPc;
 
     /**
      * web前端页面新增单据
      */
+    @ApiModelProperty(value = "web前端页面新增单据")
     private Integer checkWebNew;
 
     /**
      * 供应商平台导出单据
      */
+    @ApiModelProperty(value = "供应商平台导出单据")
     private Integer checkSp;
 
     /**
      * 流转生成单据
      */
+    @ApiModelProperty(value = "流转生成单据")
     private Integer checkChange;
 
     /**
      * UDIMS平台单据 二次校验
      */
+    @ApiModelProperty(value = "UDIMS平台单据 二次校验")
     private Boolean secCheckUdims;
 
     /**
      * 手持终端已校验单据 二次校验
      */
+    @ApiModelProperty(value = "手持终端已校验单据 二次校验")
     private Boolean secCheckPdaEd;
 
     /**
      * 手持终端未校验单据 二次校验
      */
+    @ApiModelProperty(value = "手持终端未校验单据 二次校验")
     private Boolean secCheckPdaUn;
 
     /**
      * UDI扫码通 二次校验
      */
+    @ApiModelProperty(value = "UDI扫码通 二次校验")
     private Boolean secCheckPc;
 
     /**
      * web端新增单据 二次复核
      */
+    @ApiModelProperty(value = "web端新增单据 二次复核")
     private Boolean secCheckWebNew;
 
     /**
      * 自动补单二次复核
      */
+    @ApiModelProperty(value = "自动补单二次复核")
     private Boolean secCheckChange;
 
     /**
      * 供应商平台导出单据
      */
+    @ApiModelProperty(value = "供应商平台导出单据")
     private Boolean secCheckSp;
 
     /**
      * 往来单位类型
      */
+    @ApiModelProperty(value = "往来单位类型")
     @NotNull(message = "请选择往来信息类型")
     private Integer corpType;
 
     /**
      * 补单扫码单据类型
      */
+    @ApiModelProperty(value = "补单扫码单据类型")
     private String supplementOrderType;
 
     /**
      * 平衡补单是否校验
      */
+    @ApiModelProperty(value = "平衡补单是否校验")
     private Integer checkBalance;
 
     /**
      * 平衡补单是否二次验收
      */
+    @ApiModelProperty(value = "平衡补单是否二次验收")
     private Boolean secCheckBalance;
 
     /**
      * 允许科室多次使用出库
      */
+    @ApiModelProperty(value = "允许科室多次使用出库")
     private Boolean useDyCount;
 
     /**
      * 到期提示
      */
+    @ApiModelProperty(value = "到期提示")
     private Boolean expireTip;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     /**
      * 默认往来单位
      */
+    @ApiModelProperty(value = "默认往来单位")
     private String defaultUnit;
 
     /**
      * 创建单据前缀
      */
+    @ApiModelProperty(value = "创建单据前缀")
     private String prefix;
 
     /**
      * 出库是否直接上传至自助平台
      */
+    @ApiModelProperty(value = "出库是否直接上传至自助平台")
     private Boolean outToSpms;
 
     /**
      * 允许出库自动缺量补单
      */
+    @ApiModelProperty(value = "允许出库自动缺量补单")
     private Boolean ullageFill;
 
     /**
      * 是否只采集预验收产品
      */
+    @ApiModelProperty(value = "是否只采集预验收产品")
     private Boolean scanPreIn;
 
     /**
      * 是否访问库存
      */
+    @ApiModelProperty(value = "是否访问库存")
     private Boolean vailInv;
 
     /**
      * 允许验收自助平台单据
      */
+    @ApiModelProperty(value = "允许验收自助平台单据")
     private Boolean entrutSpms;
 
     /**
      * 是否强制三期校验
      */
+    @ApiModelProperty(value = "是否强制三期校验")
     private Boolean codeFillCheck;
 
     /**
      * 默认分库
      */
+    @ApiModelProperty(value = "默认分库")
     private String defaultSubInv;
 
     /**
      * 默认仓库
      */
+    @ApiModelProperty(value = "默认仓库")
     private String defaultInv;
 
     /**
      * 订单详情展示方式：0：根据批次号展示，1:根据条码展示
      */
+    @ApiModelProperty(value = "订单详情展示方式：0：根据批次号展示，1:根据条码展示")
     private Boolean orderVisibleType;
 
     /**
      * 是否校验复制单据
      */
+    @ApiModelProperty(value = "是否校验复制单据")
     private Integer checkCopy;
 
     /**
      * 是否二次校验复制单据
      */
+    @ApiModelProperty(value = "是否二次校验复制单据")
     private Boolean secCheckCopy;
 
     /**
      * 第三方系统单据类型
      */
+    @ApiModelProperty(value = "第三方系统单据类型")
     private String originAction;
 
     /**
      * 是否预入库
      */
+    @ApiModelProperty(value = "是否预入库")
     private Boolean advanceType;
 
     /**
      * 是否流转
      */
+    @ApiModelProperty(value = "是否流转")
     private Boolean changeEnable;
 
     /**
      * 是否供应商使用
      */
+    @ApiModelProperty(value = "是否供应商使用")
     private Integer spUse;
 
     /**
      * 是否预验收单据类型
      */
+    @ApiModelProperty(value = "是否预验收单据类型")
     private Boolean preIn;
 
     /**
      * 缺量补单是否全量补单
      */
+    @ApiModelProperty(value = "缺量补单是否全量补单")
     private Boolean supplementAll;
-
+    @ApiModelProperty(value = "预付款退款")
     private boolean preInBack;
+    @ApiModelProperty(value = "校验是否可配送")
     private boolean vailDispatch;       //校验是否可配送
+    @ApiModelProperty(value = "校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品")
     private int vailGroupBuy;            //校验是否集采产品  0:全部，1：只采集集采产品，2：只采集非集采产品
+    @ApiModelProperty(value = "1:正常；2：送货；3.到货")
     private Integer busType;           //1:正常；2：送货；3.到货
+    @ApiModelProperty(value = "1：带票（正常）；2.预验收。3：寄售")
     private int actionType;             //1：带票（正常）；2.预验收。3：寄售
+    @ApiModelProperty(value = "入库")
     private boolean inStock;
 
-
+    @ApiModelProperty(value = "第三方检查启用")
     private boolean thrCheckEnable;
+    @ApiModelProperty(value = "第三方检查网站更新")
     private boolean thrCheckWebNew;
+    @ApiModelProperty(value = "第三方检查PDA单元")
     private boolean thrCheckPdaUn;
+    @ApiModelProperty(value = "第三方检查PDA编辑")
     private boolean thrCheckPdaEd;
+    @ApiModelProperty(value = "第三方检查UDIMS")
     private boolean thrCheckUdims;
+    @ApiModelProperty(value = "第三方检查PC")
     private boolean thrCheckPc;
+    @ApiModelProperty(value = "第三方检查SP")
     private boolean thrCheckSp;
+    @ApiModelProperty(value = "第三方检查更改")
     private boolean thrCheckChange;
+    @ApiModelProperty(value = "第三方检查余额")
     private boolean thrCheckBalance;
+    @ApiModelProperty(value = "第三方检查复制")
     private boolean thrCheckCopy;
-
+    @ApiModelProperty(value = "填充代码关系")
     private boolean fillCodeRel;
 
-
+    @ApiModelProperty(value = "检查有效日期")
     private Integer checkVailDate;
+    @ApiModelProperty(value = "检查过期时间")
     private Integer checkExpire;
+    @ApiModelProperty(value = "检查证书过期时间")
     private Integer checkCertExpire;
+    @ApiModelProperty(value = "预付款退款操作")
     private String preInBackAction;
+    @ApiModelProperty(value = "退预付款类型")
     private Integer backPreinType;
+    @ApiModelProperty(value = "排序编号")
     private Integer sortNum;
-
+    @ApiModelProperty(value = "预付款")
     private Boolean advancePreIn;
 
 

src/main/java/com/glxp/api/req/basic/CombineSingleUnitRequest.java

@@ -2,11 +2,16 @@ package com.glxp.api.req.basic;
 
 
 import com.glxp.api.res.basic.BasicErpUnitsResponse;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel("合并单元请求")
 @Data
 public class CombineSingleUnitRequest {
+    @ApiModelProperty(value = "密钥")
     private String key;
+    @ApiModelProperty(value = "第三方系统")
     private String thirdSys;
+    @ApiModelProperty(value = "基本ERP单元响应")
     private BasicErpUnitsResponse basicErpUnitsResponse;
 }

src/main/java/com/glxp/api/req/basic/CombineUnitRequest.java

@@ -2,14 +2,18 @@ package com.glxp.api.req.basic;
 
 
 import com.glxp.api.res.basic.BasicErpUnitsResponse;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("合并单元请求")
 @Data
 public class CombineUnitRequest {
-
+    @ApiModelProperty(value = "密钥")
     List<String> keys;
+    @ApiModelProperty(value = "第三方系统")
     private String thirdSys;
+    @ApiModelProperty(value = "客户制造文档响应")
     List<BasicErpUnitsResponse> custmandocResponses;
 }

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -1,53 +1,82 @@
 package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
-
+@ApiModel("公司产品相关性请求")
 @Data
 public class CompanyProductRelevanceRequest extends ListPageRequest {
+    @ApiModelProperty(value = "注册/备案人名称")
     private String ylqxzcrbarmc;
+    @ApiModelProperty(value = "产品名称，通用名称")
     private String cpmctymc;
+    @ApiModelProperty(value = "名称代码")
     private String nameCode;
+    @ApiModelProperty(value = "uuid")
     private String uuid;
+    @ApiModelProperty(value = "原始UUID")
     private String originUuid;
+    @ApiModelProperty(value = "规格型号")
     private String ggxh;
+    @ApiModelProperty(value = "第三方ID")
     private String thirdId;
+    @ApiModelProperty(value = "主键")
     private String id;
 
+    @ApiModelProperty(value = "第三方ID1")
     private String thirdId1;
+    @ApiModelProperty(value = "第三方ID2")
     private String thirdId2;
+    @ApiModelProperty(value = "第三方ID3")
     private String thirdId3;
+    @ApiModelProperty(value = "第三方ID4")
     private String thirdId4;
+    @ApiModelProperty(value = "已禁用")
     private Boolean isDisable;
+    @ApiModelProperty(value = "第三方代码/编号")
 
     private String thirdCode;
+    @ApiModelProperty(value = "第三方系统")
     private String thirdSys;
-
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "\"注册/备案证号，")
     private String zczbhhzbapzbh;
+    @ApiModelProperty(value = "设备接口类型")
     private Integer diType;
 
-
+    @ApiModelProperty(value = "联盟代码/编号")
     private String unionCode;
+    @ApiModelProperty(value = "用户设备标识码")
     private String udiCode;
+    @ApiModelProperty(value = "第三方PI ID")
     private String thrPiId;
 
 
+    @ApiModelProperty(value = "已审核/是否审核")
     private Boolean isCheck;
-
+    @ApiModelProperty(value = "0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码")
     private Integer filterType;         //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
+    @ApiModelProperty(value = "客户ID")
     private String customerId;
 
-
+    @ApiModelProperty(value = "审核状态")
     private String auditStatus;
+    @ApiModelProperty(value = "公司名称")
     private String companyName;
+    @ApiModelProperty(value = "锁定状态")
     private Integer lockStatus;
+    @ApiModelProperty(value = "是否高级")
     private Boolean isAdavence;
+    @ApiModelProperty(value = "单元外键")
     private String unitFk;
-
+    @ApiModelProperty(value = "公司ID")
     private String corpId;
+    @ApiModelProperty(value = "账单类型")
     private String billType;
+    @ApiModelProperty(value = "UUID列表")
     private List<String> uuids;
 }

src/main/java/com/glxp/api/req/basic/FilterBasicProductSetrequest.java

@@ -2,13 +2,16 @@ package com.glxp.api.req.basic;
 
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel("基本产品集过滤请求")
 @Data
 public class FilterBasicProductSetrequest extends ListPageRequest {
 
-
+    @ApiModelProperty(value = "参数名称")
     String parmName;
+    @ApiModelProperty(value = "启用/开启")
     Boolean enable;
 
 }

src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java

@@ -1,14 +1,17 @@
 package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * 单据流转设置接口查询参数
  */
+@ApiModel("单据流转设置接口查询参数")
 @Data
 public class FilterBusTypeChangeRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "原单据类型代码")
     /**
      * 原单据类型代码
      */
@@ -17,21 +20,25 @@ public class FilterBusTypeChangeRequest extends ListPageRequest {
     /**
      * 原单据类型名称
      */
+    @ApiModelProperty(value = "原单据类型名称")
     private String originName;
 
     /**
      * 1:领用单据类型；2.产品申购类型；3.采购计划单据类型
      */
+    @ApiModelProperty(value = "1:领用单据类型；2.产品申购类型；3.采购计划单据类型")
     private Integer type;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
     private String lastUpdateTime;
 
     /**
      * 是否启用
      */
+    @ApiModelProperty(value = "是否启用")
     private Boolean enable;
 
 }

src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java

@@ -1,41 +1,49 @@
 package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
  * 补单设置接口查询参数
  */
+@ApiModel("补单设置接口查询参数")
 @Data
 public class FilterBusTypePreRequest extends ListPageRequest {
 
     /**
      * 单据类型编码
      */
+    @ApiModelProperty(value = "单据类型编码")
     private String action;
 
     /**
      * 第三方单据类型编码
      */
+    @ApiModelProperty(value = "第三方单据类型编码")
     private String thirdAction;
-
+    @ApiModelProperty(value = "类型")
     private String type;
 
     /**
      * 原单据类型代码
      */
+    @ApiModelProperty(value = "原单据类型代码")
     private String originAction;
 
     /**
      * 原单据类型名称
      */
+    @ApiModelProperty(value = "原单据类型名称")
     private String originName;
 
     /**
      * 目标单据类型名称
      */
+    @ApiModelProperty(value = "目标单据类型名称")
     private String targetName;
-
+    @ApiModelProperty(value = "名称")
     private String name;
 
 }

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -1,6 +1,8 @@
 package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -9,106 +11,131 @@ import java.util.List;
  * 单据类型查询参数
  */
 @Data
+@ApiModel("单据类型查询参数")
 public class FilterBussinessTypeRequest extends ListPageRequest {
 
     /**
      * 是否启用, 0：未启用  1：启用
      */
+    @ApiModelProperty(value = "是否启用, 0：未启用  1：启用")
     private Boolean enable;
 
     /**
      * 单据类型编码
      */
+    @ApiModelProperty(value = "单据类型编码")
     private String action;
 
     /**
      * 第三方单据类型编码
      */
+    @ApiModelProperty(value = "第三方单据类型编码")
     private String thirdAction;
 
     /**
      * 单据类型名称
      */
+    @ApiModelProperty(value = "单据类型名称")
     private String name;
 
     /**
      * 主类型（出库，入库）
      */
+    @ApiModelProperty(value = "主类型（出库，入库）")
     private String mainAction;
 
     /**
      * 是否二次验收
      */
+    @ApiModelProperty(value = "是否二次验收")
     private Boolean checkEnable;
 
     /**
      * 是否预入库
      */
+    @ApiModelProperty(value = "是否预入库")
     private Integer advanceType;
-
+    @ApiModelProperty(value = "类型")
     private String type;
 
     /**
      * 是否供应商使用
      */
+    @ApiModelProperty(value = "是否供应商使用")
     private Boolean spUse;
 
     /**
      * 是否二次验收
      */
+    @ApiModelProperty(value = "是否二次验收")
     private Boolean secCheckEnable;
 
     /**
      * 仓库用户关联单据类型用户ID
      */
+    @ApiModelProperty(value = "仓库用户关联单据类型用户ID")
     private Long userId;
 
     /**
      * 仓库编码，用于关联查询仓库关联单据类型
      */
+    @ApiModelProperty(value = "仓库编码，用于关联查询仓库关联单据类型")
     private String locInvCode;
 
     /**
      *
      */
+    @ApiModelProperty(value = "发票代码")
     private String invCode;
 
     /**
      * 分库编码，用于关联查询仓库关联单据类型
      */
+    @ApiModelProperty(value = "分库编码，用于关联查询仓库关联单据类型")
     private String locSubInvCode;
 
     /**
      * 最近一次更新时间
      */
+    @ApiModelProperty(value = "最近一次更新时间")
     private String lastUpdateTime;
 
     /**
      * 仓库关联单据类型的仓库编码
      */
+    @ApiModelProperty(value = "仓库关联单据类型的仓库编码")
     private String code;
 
     /**
      * 单据类型ID集合
      */
+    @ApiModelProperty(value = "单据类型ID集合")
     private String ids;
 
     /**
      * 单据类型编码集合
      */
+    @ApiModelProperty(value = "单据类型编码集合")
     private List<String> actionList;
 
     /**
      * 是否预验收单据类型
      */
+    @ApiModelProperty(value = "是否预验收单据类型")
     private Boolean preIn;
-
+    @ApiModelProperty(value = "业务类型")
     private Integer busType;
+    @ApiModelProperty(value = "库存")
     private Boolean inStock;
+    @ApiModelProperty(value = "填充代码关系")
     private Boolean fillCodeRel;
-
+    @ApiModelProperty(value = "Vue类型")
     private String vueType;
+    @ApiModelProperty(value = "公司类型")
     private Integer corpType;
+    @ApiModelProperty(value = "排序编号")
     private Integer sortNum;
+    @ApiModelProperty(value = "操作类型")
     private Integer actionType;
+
 }

src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java

@@ -1,16 +1,24 @@
 package com.glxp.api.req.basic;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel("公司产品相关性过滤请求")
 @Data
 public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "客户ID")
     private Long customerId;
+    @ApiModelProperty(value = "产品ID")
     private Long productId;
+    @ApiModelProperty(value = "产品UUID")
     private String productUuid;
+    @ApiModelProperty(value = "udi外键")
     private String udiRlIdFk;
-    private String unitFk;
+    @ApiModelProperty(value = "单位外键")
+        private String unitFk;
+    @ApiModelProperty(value = "最后更新时间")
     private String lastUpdateTime;
+    @ApiModelProperty(value = "密钥")
     private String key;
 }

src/main/java/com/glxp/api/req/basic/FilterCorpExportLogRequest.java

@@ -2,14 +2,18 @@ package com.glxp.api.req.basic;
 
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel("公司导出日志过滤请求")
 @Data
 public class FilterCorpExportLogRequest extends ListPageRequest {
 
 
-
+    @ApiModelProperty(value = "生成密钥")
     private String genKey;
+    @ApiModelProperty(value = "状态")
     private Integer status;
+    @ApiModelProperty(value = "类型")
     private Integer type;
 }

src/main/java/com/glxp/api/util/page/ListPageRequest.java

@@ -1,6 +1,7 @@
 package com.glxp.api.util.page;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.Max;
@@ -13,11 +14,11 @@ import javax.validation.constraints.Min;
 @Data
 public class ListPageRequest {
 
-
+    @ApiModelProperty(value = "页数")
     @Min(message = "分页参数错误", value = 1)
     private Integer page;
 
-
+    @ApiModelProperty(value = "页数范围")
     @Min(value = 1, message = "分页参数不能小于1")
     @Max(value = 500, message = "分页参数不能大于500")
     private Integer limit;