From c36f588fadfb8d70a0fa803859d9313d8d9d4b25 Mon Sep 17 00:00:00 2001 From: mrzcc <121184950@qq.com> Date: Mon, 9 Mar 2020 14:55:59 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BC=98=E5=8C=96purchaseApplyDetail.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseApply-detail/purchaseApplyDetail.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js b/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js index 450d96c7c3..155844389b 100644 --- a/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js +++ b/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js @@ -35,8 +35,7 @@ params:{ page:_page, row:_rows, - applyOrderId:vc.component.purchaseApplyDetailInfo.applyOrderId, - resOrderType:'10000' + applyOrderId:vc.component.purchaseApplyDetailInfo.applyOrderId } }; From 45b72fe6af1b2961a4837093d0f397606ed35fb1 Mon Sep 17 00:00:00 2001 From: mrzcc <121184950@qq.com> Date: Mon, 9 Mar 2020 14:57:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96ListPurchaseApplysListene?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/listener/purchaseApply/ListPurchaseApplysListener.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java b/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java index d7b3933312..5392dc5c73 100644 --- a/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java +++ b/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java @@ -9,7 +9,6 @@ import com.java110.dto.purchaseApply.PurchaseApplyDto; import com.java110.event.service.api.ServiceDataFlowEvent; import com.java110.utils.constant.ServiceCodePurchaseApplyConstant; -import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.api.purchaseApply.ApiPurchaseApplyDataVo; import com.java110.vo.api.purchaseApply.ApiPurchaseApplyVo; @@ -60,7 +59,7 @@ public void setPurchaseApplyInnerServiceSMOImpl(IPurchaseApplyInnerServiceSMO pu @Override protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) { - Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写订单类型"); + //Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写订单类型"); super.validatePageInfo(reqJson); } From ff44ea929df7791c4f4c5413f0d4bee83e472ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=88=90?= <121184950@qq.com> Date: Fri, 20 Mar 2020 21:32:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96listActivitiess.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/document/api/activities/listActivitiess.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/document/api/activities/listActivitiess.md b/docs/document/api/activities/listActivitiess.md index cb7b11fee5..03d08375ef 100644 --- a/docs/document/api/activities/listActivitiess.md +++ b/docs/document/api/activities/listActivitiess.md @@ -1,6 +1,6 @@ -**1\. 查询活动** +**1\. 查询活动 ** ###### 接口功能 > 用户通过web端或APP查询活动接口 From a8b67749c32595b7a2485bd40ccd92ca42b805f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=88=90?= <121184950@qq.com> Date: Fri, 20 Mar 2020 21:37:20 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BC=98=E5=8C=96listActivitiess.md(?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/document/api/activities/listActivitiess.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/document/api/activities/listActivitiess.md b/docs/document/api/activities/listActivitiess.md index 03d08375ef..2e2f4e9726 100644 --- a/docs/document/api/activities/listActivitiess.md +++ b/docs/document/api/activities/listActivitiess.md @@ -1,6 +1,6 @@ -**1\. 查询活动 ** +**1\. 查询活动 ** ###### 接口功能 > 用户通过web端或APP查询活动接口 From 062309f84ac6c339a8d5bdc931efa33328d05079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=88=90?= <121184950@qq.com> Date: Fri, 20 Mar 2020 21:42:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?applyApplicationKey.md(=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/document/api/applicationKey/applyApplicationKey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/document/api/applicationKey/applyApplicationKey.md b/docs/document/api/applicationKey/applyApplicationKey.md index bd5d1cc5f1..bbe3756597 100644 --- a/docs/document/api/applicationKey/applyApplicationKey.md +++ b/docs/document/api/applicationKey/applyApplicationKey.md @@ -1,6 +1,6 @@ -**1\. 手机端申请钥匙** +**1\. 手机端申请钥匙 ** ###### 接口功能 > 手机端申请钥匙接口 From ba5c054e312bf7b2eb15834f848155dfa3e881cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=88=90?= <121184950@qq.com> Date: Fri, 20 Mar 2020 21:51:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?applyApplicationKey.md(=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/document/api/applicationKey/applyApplicationKey.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/document/api/applicationKey/applyApplicationKey.md b/docs/document/api/applicationKey/applyApplicationKey.md index bbe3756597..2994a28f72 100644 --- a/docs/document/api/applicationKey/applyApplicationKey.md +++ b/docs/document/api/applicationKey/applyApplicationKey.md @@ -1,6 +1,6 @@ -**1\. 手机端申请钥匙 ** +**1\. 手机端申请钥匙 ** ###### 接口功能 > 手机端申请钥匙接口 From d92420bd10fc0d625121d5da72c5c500f75c0250 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Sun, 22 Mar 2020 13:37:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=A5=BC=E6=A0=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/community/FloorServiceDaoImplMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml index af23d9d2d5..74f3c4d995 100644 --- a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml +++ b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml @@ -83,7 +83,7 @@ select - t.operate,t.res_order_type resOrderType, - t.description, - t.apply_order_id applyOrderId,t.state, - t.store_id storeId, - t.user_name userName,t.b_id bId,t.user_id userId + t.operate,t.res_order_type resOrderType, + t.description, + t.apply_order_id applyOrderId,t.state, + t.store_id storeId, + t.user_name userName,t.b_id bId,t.user_id userId from business_purchase_apply t where 1 =1 @@ -141,11 +168,12 @@ + + +