Merge branch 'dev-20231023'

# Conflicts:
#	src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java

src/main/java/com/sztzjy/forex/trading_trading/controller/TrainingController.java

@@ -136,10 +136,10 @@ public class TrainingController {
     @Permission(codes = PermissionType.TRAINING_MANAGEMENT_ADD)
     @ApiOperation("教师端----添加实训成员时用：获取班级列表")
     @GetMapping("findClassNameList")
-    public ResultEntity<List<Map<String, Object>>> findClassNameList(@ApiParam("专业Id") Integer majorId) {
+    public ResultEntity<List<Map<String, Object>>> findClassNameList(@ApiParam("专业Id") String majorId) {
         JwtUser currentUser = TokenProvider.getJWTUser(request);
         List<Map<String, Object>> mapList;
-        if (majorId == null || majorId == 0) {
+        if (majorId == null ) {
             mapList = TzApi.GetClassBySchoolIdForForeignExchangeTrading(currentUser);
         } else {
             mapList = TzApi.GetClassByMajorIdForForeignExchangeTrading(currentUser, majorId);

src/main/java/com/sztzjy/forex/trading_trading/util/TzApi.java

@@ -27,7 +27,7 @@ public class TzApi {
     private final static String GET_CLASS = NEW_API_URL + "/server/account/findClassesBySchoolId.json";
 
     private final static String GET_MAJOR = NEW_API_URL + "/server/account/findMajorsBySchoolId.json";
-    private final static String GET_CLASS_BY_MAJOR = API_URL + "/Account/GetClassByMajorIdForForeignExchangeTrading";
+    private final static String GET_CLASS_BY_MAJOR = NEW_API_URL + "/server/account/getClassListByMajorId.json";
     private final static String GET_STUDENT_BY_ClALL = NEW_API_URL + "/server/account/getStudentsByClassId.json";
     private final static String GET_STUDENT_BY_KEYWORD = API_URL + "/Account/GetStudentInfoByKeywordForForeignExchangeTrading";
     private final static String PAGE_STUDENT_BY_KEYWORD = API_URL + "/Account/PagedListStudentInfoByClassIdForForeignExchangeTrading";
@@ -95,7 +95,7 @@ public class TzApi {
         return getDataFromApi(url, token);
     }
 
-    public static List<Map<String, Object>> GetClassByMajorIdForForeignExchangeTrading(JwtUser user, int majorId) {
+    public static List<Map<String, Object>> GetClassByMajorIdForForeignExchangeTrading(JwtUser user, String majorId) {
         String token = getToken(user);
         String url = GET_CLASS_BY_MAJOR + "?majorId=" + majorId;
         return getDataFromApi(url, token);