Merge branch 'test' into dev

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopExtend.java

@@ -118,18 +118,22 @@ public class TbShopExtend extends Model<TbShopExtend> {
                 case "index_bg":
                     this.name = "店铺首页背景图";
                     this.detail="建议尺寸: 375*600 ";
+                    this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/shuangbackground.png";
                     break;
                 case "my_bg":
                     this.name = "我的页面背景图";
                     this.detail="建议尺寸: 375*200";
+                    this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png";
                     break;
                 case "member_bg":
                     this.name = "会员卡页面背景图";
                     this.detail="建议尺寸: 315*152";
+                    this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_bg.png";
                     break;
                 case "shopinfo_bg":
                     this.name = "商品列表顶部背景图";
                     this.detail="建议尺寸: 375*120";
+                    this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png";
                     break;
             }
         }

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopExtendServiceImpl.java

@@ -41,7 +41,7 @@ public class TbShopExtendServiceImpl extends ServiceImpl<TbShopExtendMapper, TbS
         }
         wrapper.orderByDesc("create_time");
         Page<TbShopExtend> ipage = tbShopExtendmapper.selectPage(page, wrapper);
-        checkAndInitialize(ipage,criteria.getShopId());
+        ipage = checkAndInitialize(ipage,criteria.getShopId());
         return PageUtil.toPage(ipage.getRecords(), ipage.getTotal());
     }