From cf148cae4937f807347e56d94b2dc96c9f258c59 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 15:04:48 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
index 71e7cba..2f5f475 100644
--- a/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
+++ b/gc-core/src/main/java/com/xzx/gc/model/admin/UserModel.java
@@ -89,7 +89,7 @@
@ApiModelProperty("1:已删除 0：未删除")
String delFlag;
- @ApiModelProperty("1:已删除 0：未删除")
+// @ApiModelProperty("1:已删除 0：未删除")
Integer orderStatus3;
Integer orderStatus5;
//入库重量
--
Gitblit v1.9.1