Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/company/controller/qw/QwExternalContactController.java

@@ -207,14 +207,14 @@ public class QwExternalContactController extends BaseController
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('qw:externalContact:syncMyClient')")
+
     @Log(title = "同步我的企业微信客户", businessType = BusinessType.INSERT)
     @GetMapping("/syncMyExternalContact/{id}")
     public R  syncMyExternalContact(@PathVariable("id") Long id ) throws IOException {
         return qwExternalContactService.syncMyQwExternalContact(id);
     }
 
-    @PreAuthorize("@ss.hasPermi('qw:externalContact:syncNewClient')")
+
     @Log(title = "新客同步", businessType = BusinessType.INSERT)
     @GetMapping("/syncAddMyExternalContact/{id}")
     public R  syncAddMyExternalContact(@PathVariable("id") Long id ) throws IOException {

fs-service/src/main/java/com/fs/common/param/LoginMaWxParam.java

@@ -34,7 +34,7 @@ public class LoginMaWxParam implements Serializable {
     @ApiModelProperty(value = "用户头像")
     private String avatar;
 
-    @NotNull(message = "项目id不能为空")
+//    @NotNull(message = "项目id不能为空")
     @ApiModelProperty(value = "课程归属项目id")
     private Long projectId;
 

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -416,7 +416,7 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         if (StringUtils.isNotNull(roles))
         {
             // 新增用户与角色管理
-            List<CompanyUserRole> list = new ArrayList<CompanyUserRole>();
+            List<CompanyUserRole> list = new ArrayList<>();
             for (Long roleId : roles)
             {
                 CompanyUserRole ur = new CompanyUserRole();

fs-service/src/main/java/com/fs/course/param/newfs/FsUserCourseBeMemberParam.java

@@ -24,7 +24,7 @@ public class FsUserCourseBeMemberParam implements Serializable {
     @ApiModelProperty(value = "标签ids，数组格式")
     private String[] tagIds;
 
-    @NotNull(message = "项目id不能为空")
+//    @NotNull(message = "项目id不能为空")
     @ApiModelProperty(value = "课程归属项目id")
     private Long projectId;
 

fs-user-app/src/main/java/com/fs/app/param/FsUserLoginByMpParam.java

@@ -20,7 +20,7 @@ public class FsUserLoginByMpParam implements Serializable {
     @NotNull(message = "销售id不能为空")
     @ApiModelProperty(value = "销售id")
     private Long companyUserId;
-    @NotNull(message = "项目ID不能为空")
+//    @NotNull(message = "项目ID不能为空")
     @ApiModelProperty(value = "项目ID")
     private Long projectId;