Commit Graph
619 Commits
Author SHA1 Message Date
c-zhouhf1 d6f668e6b7 commit 2026-07-06 11:18:00 +08:00
c-zhouhf1 f437c0444d Merge remote-tracking branch 'origin/main' 2026-07-04 01:22:46 +08:00
c-zhouhf1 91556ee146 commit 2026-07-04 01:22:36 +08:00
c-zhangr1 f0bec867b8 Merge remote-tracking branch 'origin/main' 2026-07-04 01:18:28 +08:00
c-zhangr1 67c21e5dfa 南大三十年教职工疗休养 2026-07-04 01:08:45 +08:00
c-zhouhf1 8c3c6f45c3 commit 2026-07-03 08:46:44 +08:00
c-zhouhf1 a79280d16d commit 2026-07-02 16:52:08 +08:00
c-zhouhf1 4afb3bd835 commit 2026-07-02 16:06:57 +08:00
c-zhangr1 f637e02c08 南大三十年教职工疗休养 2026-07-02 14:22:32 +08:00
c-zhangr1 8b5de6b196 南大三十年教职工疗休养 2026-07-01 18:17:08 +08:00
c-zhangr1 e5a7b49bc1 南大三十年教职工疗休养 2026-06-29 11:01:59 +08:00
c-zhangr1 1b888b4fce 南大三十年教职工疗休养 2026-06-26 14:32:53 +08:00
c-zhangr1 a1547b133e 南大三十年教职工疗休养 2026-06-25 20:54:58 +08:00
c-zhangr1 f39dad393f Merge remote-tracking branch 'origin/main' 2026-06-25 14:24:55 +08:00
c-zhangr1 521fc4446b 南大三十年教职工疗休养 2026-06-25 14:24:29 +08:00
c-zhangr1 3d0bcabc65 南大三十年教职工疗休养 2026-06-24 10:51:45 +08:00
c-zhouhf1 21a5236c16 commit 2026-06-23 15:54:57 +08:00
c-zhangr1 f355f5e7a1 Changes 2026-06-22 14:41:21 +08:00
c-zhangr1 5477ae58f4 1 2026-06-22 10:00:54 +08:00
c-zhangr1 0141365c61 Merge remote-tracking branch 'origin/main' 2026-06-18 17:54:06 +08:00
c-zhangr1 702615c59f 1 2026-06-18 17:53:54 +08:00
c-zhouhf1 bedf31bf0c commit 2026-06-18 15:33:11 +08:00
c-zhangr1 47e971ebc8 疗休养优化1.5 2026-06-17 11:43:19 +08:00
c-zhangr1 a8abd16c7a 疗休养优化1.4 2026-06-16 08:57:25 +08:00
c-zhangr1 990551905f 疗休养优化1.3 2026-06-15 17:44:14 +08:00
c-zhangr1 850f4742a2 疗休养优化1.2 2026-06-15 17:43:33 +08:00
c-zhangr1 6b892bb026 疗休养优化1.1 2026-06-14 17:53:58 +08:00
c-zhangr1 f4f8387c1e 疗休养优化 2026-06-14 17:21:05 +08:00
c-zhangr1 f94ca77ee3 1 2026-06-12 16:34:34 +08:00
c-zhangr1 d24424d2cc Merge remote-tracking branch 'origin/main' 2026-06-12 15:32:22 +08:00
c-zhangr1 41935b7f0f 1 2026-06-12 15:31:20 +08:00
c-zhangr1 b23d3bfa79 1 2026-06-12 15:30:50 +08:00
c-zhangr1 742a0ff388 1 2026-06-12 09:28:09 +08:00
c-zhouhf1 6fc951b68f commit 2026-06-12 09:26:33 +08:00
c-zhangr1 67bf620d01 1 2026-06-11 17:26:11 +08:00
c-zhangr1 ec1d9f1aa1 南昌大学信息中心获取数据时,校验国籍 2026-06-10 15:28:08 +08:00
c-zhouhf1 f4c82c5c33 commit 2026-06-10 14:47:07 +08:00
c-zhouhf1 08d00b05ee Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2026-06-10 14:39:08 +08:00
c-zhouhf1 351806c339 commit 2026-06-10 14:38:57 +08:00
c-zhangr1 7449cbebe4 教代会意见->校工会审核:导入 2026-06-10 11:16:32 +08:00
c-zhangr1 06b8a74f41 1 2026-06-10 10:29:36 +08:00
c-zhangr1 85f676dd60 1 2026-06-10 09:08:18 +08:00
c-zhangr1 5ce5d36f8b 1 2026-06-10 09:08:02 +08:00
c-zhouhf1 1da9b94af2 commit 2026-06-09 17:06:35 +08:00
dd3s_206 0895d0b897 30教龄教职工管理:隐藏'是否会员'列, ; 2026-06-08 16:33:11 +08:00
dd3s_206 cc8f4a1732 30教龄教职工管理:搜索栏改动从会员管理搬来综合查询的搜索项(性别,在职状态,教职工类别,编制类别;),保留平铺样式(单选改成多选); 2026-06-08 16:22:04 +08:00
dd3s_206 544c96f5ce Merge remote-tracking branch 'origin/main' 2026-06-08 15:08:45 +08:00
dd3s_206 e969db447c 30教龄教职工管理:搜索新增截止日期,新增'即将满30年 周年满30年 超30年'查询和统计; 教职工汇总的查询范围:由cnd.and("u.isThirtyTeach", "=", 1)标记,改成会员cnd.and("u.member", "=", 1); 2026-06-08 15:05:33 +08:00
c-zhangr1 dd3d674959 Merge remote-tracking branch 'origin/main' 2026-06-08 08:57:07 +08:00
c-zhangr1 5cf398f2b1 1 2026-06-08 08:56:48 +08:00