搜索条件新增

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysRole.java

@@ -40,7 +40,7 @@ public class SysRole implements Serializable
     /** 角色名称 */
     @ApiModelProperty(value ="角色名称")
     @Excel(name = "角色名称")
-    @NotBlank(message = "角色名称不能为空")
+    //@NotBlank(message = "角色名称不能为空")
     @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
     private String roleName;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -354,7 +354,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeAddBo.setSubscribeStatus(1);
             }
             if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
-                userSubscribeAddBo.setSubscribeStatus(2);
+                userSubscribeImport.setCause("预约状态为取消");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
             }
 
             if (!StringUtils.isEmpty(userSubscribeImport.getBeforeStatus()) && !StringUtils.isEmpty(userSubscribeImport.getBeforeName())) {