|
@@ -62,7 +62,7 @@ public class GoodsProvider {
|
|
|
*/
|
|
|
public String searchGlobal(PageDto param) {
|
|
|
StringBuffer sql = new StringBuffer(
|
|
|
- "(select a.id,a.name, a.description ,'goods' as type from tb_goods a where (a.is_delete=0 and a.display=1)");
|
|
|
+ "(select a.id,a.name, a.description ,a.create_time,a.update_time,'goods' as type from tb_goods a where (a.is_delete=0 and a.display=1)");
|
|
|
|
|
|
|
|
|
String searchKey = param.getSearchKey();
|
|
@@ -76,7 +76,7 @@ public class GoodsProvider {
|
|
|
|
|
|
sql.append(" UNION ALL");
|
|
|
|
|
|
- sql.append(" (select b.id,b.name, b.description, 'expert' as type from tb_expert b where (b.is_delete=0 and b.display=1)");
|
|
|
+ sql.append(" (select b.id,b.name, b.description,b.create_time,b.update_time, 'expert' as type from tb_expert b where (b.is_delete=0 and b.display=1)");
|
|
|
|
|
|
if (!StringUtils.isAllBlank(searchKey)) {
|
|
|
searchKey = StringUtils.trim(searchKey);
|