Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java

@@ -37,6 +37,10 @@ public class ShopUserDetailDTO extends ShopUser {
      * 店铺信息
      */
     private ShopInfo shopInfo;
+    /**
+     * 支付密码
+     */
+    private String payPwd;
     /**
      * 店铺拓展参数
      */

cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java

@@ -19,7 +19,7 @@ public interface SysRoleService extends IService<SysRole> {
 
     List<SysRole> getByUserId(Long id);
 
-    Page<SysRole> getList(PageDTO pageDTO, String key, String startTime, String endTime);
+    Page<SysRole> getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime);
 
     Boolean add(RoleAddDTO roleAddDTO);