diff --git a/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue b/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
index 850dc56..5bb859f 100644
--- a/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
+++ b/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
@@ -186,7 +186,7 @@
dataIndex: 'deposit'
},
{
- title:'暂定数量、',
+ title:'暂定数量',
align:"center",
dataIndex: 'num'
},
@@ -195,14 +195,6 @@
align:"center",
dataIndex: 'productType_dictText'
},
- {
- title:'交货时间',
- align:"center",
- dataIndex: 'transactionTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
- },
{
title:'提货时间',
align:"center",
diff --git a/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue b/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue
index 7b69036..0890854 100644
--- a/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue
+++ b/admin-hanhai-vue/src/views/suggest/TbSuggestList.vue
@@ -165,10 +165,7 @@
{
title:'提交时间',
align:"center",
- dataIndex: 'submitTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
+ dataIndex: 'createTime',
},
{
title: '操作',
diff --git a/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue
index 7af81fa..d763aa4 100644
--- a/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue
+++ b/admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue
@@ -23,11 +23,6 @@
-
-
-
-
-
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java
index c57abc9..66a9c6a 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java
@@ -52,6 +52,7 @@ public class TbProductController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(tbProduct, req.getParameterMap());
+ queryWrapper.orderByDesc("create_time");
Page page = new Page(pageNo, pageSize);
IPage pageList = tbProductService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java
index 9b185dc..5556d37 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java
@@ -53,6 +53,7 @@ public class TbProductOrderController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(tbProductOrder, req.getParameterMap());
Page page = new Page(pageNo, pageSize);
+ queryWrapper.orderByDesc("create_time");
IPage pageList = tbProductOrderService.page(page, queryWrapper);
return Result.OK(pageList);
}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java
index 32b7d4e..6beeb49 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java
@@ -52,6 +52,7 @@ public class TbCustomsController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(tbCustoms, req.getParameterMap());
+ queryWrapper.orderByDesc("create_time");
Page page = new Page(pageNo, pageSize);
IPage pageList = tbCustomsService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/controller/TbSuggestController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/controller/TbSuggestController.java
index 551f9d6..cbbfa30 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/controller/TbSuggestController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/controller/TbSuggestController.java
@@ -52,6 +52,7 @@ public class TbSuggestController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(tbSuggest, req.getParameterMap());
+ queryWrapper.orderByDesc("create_time");
Page page = new Page(pageNo, pageSize);
IPage pageList = tbSuggestService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
index ef40e2b..6b5d008 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
@@ -53,6 +53,7 @@ public class TbUserRoleController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
Page page = new Page(pageNo, pageSize);
+ queryWrapper.orderByDesc("create_time");
IPage pageList = tbUserRoleService.page(page, queryWrapper);
return Result.OK(pageList);
}
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java
index 9e77c6a..f636b4c 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java
@@ -127,6 +127,7 @@ public class ProductServiceImpl extends ServiceImpl
JSONObject jsonObject = new JSONObject();
tbProductOrder.setCompanyName(one1.getCompanyName());
tbProductOrder.setBankName(one1.getBankNama());
+ tbProductOrder.setProductType(product.getProductType());
tbProductOrder.setBankAccount(one1.getBankAccount());
jsonObject.put("bankAccount", one1.getBankAccount());
jsonObject.put("companyName", one1.getCompanyName());