Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
933ed289ee
@ -35,8 +35,8 @@ public class QRCServiceImpl implements QRCService{
|
|||||||
collectIconList.setQr_url(base64);
|
collectIconList.setQr_url(base64);
|
||||||
collectIconListDao.insertSelective(collectIconList);
|
collectIconListDao.insertSelective(collectIconList);
|
||||||
// return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
// return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
||||||
// return JSON.toJSONString(base64);
|
return JSON.toJSONString(base64);
|
||||||
return null;
|
// return null;
|
||||||
}else {
|
}else {
|
||||||
return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user