Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature

# Conflicts:
#	eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java

@@ -209,6 +209,12 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         tbShopInfoRepository.save(tbShopInfo);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(String account) {
+        tbShopInfoRepository.updateByAcc(account);
+    }
+
     @Override
     public void deleteAll(Integer[] ids) {
         for (Integer id : ids) {

eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopInfoService.java

@@ -69,6 +69,8 @@ public interface TbShopInfoService {
     */
     void update(TbShopInfo resources);
 
+    void update(String account);
+
     /**
     * 多选删除
     * @param ids /