Commit Graph

461 Commits (d4333ee497aa6c9a530311d19897ff0455388a28)

Author SHA1 Message Date
haha b7369b07cc update code 2024-04-09 21:48:00 +08:00
姜玉琦 675007d23b 提交diamond 2024-04-09 21:46:26 +08:00
姜玉琦 f8833cd1fd Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-09 00:57:40 +08:00
姜玉琦 265a7abb1a 提交代码 2024-04-09 00:57:32 +08:00
haha 61cac97d84 update code 2024-04-09 00:27:00 +08:00
haha 1d4bb33bda Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-09 00:01:47 +08:00
haha eebd27dfb5 update code 2024-04-09 00:01:26 +08:00
姜玉琦 06d152aaeb Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-08 23:34:56 +08:00
haha 527aa28a0b update code 2024-04-08 23:34:32 +08:00
姜玉琦 8810677ca7 提交代码 2024-04-08 23:34:22 +08:00
姜玉琦 963d86f209 提交代码 2024-04-08 11:33:58 +08:00
haha be19c476b5 update code 2024-04-08 02:08:28 +08:00
haha 73690ae5c2 update code 2024-04-08 01:54:00 +08:00
haha 26316752c1 update code 2024-04-07 21:18:24 +08:00
姜玉琦 e9c16e7964 提交代码 2024-04-07 00:51:44 +08:00
haha d4e38dc40f update code 2024-04-07 00:07:56 +08:00
haha da63db6425 update code 2024-04-06 23:41:04 +08:00
haha f4bb8d22df update code 2024-04-06 23:25:16 +08:00
姜玉琦 ec8cf4060c 提交diamagnetic 2024-04-06 22:51:35 +08:00
haha 9b3feddcfb update code 2024-04-06 21:21:55 +08:00
姜玉琦 194d6214c6 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-06 17:59:18 +08:00
姜玉琦 f8e82414ad 提交代码 2024-04-06 17:59:11 +08:00
haha e21756cd24 update code 2024-04-06 17:39:54 +08:00
haha 645944e305 update code 2024-04-06 16:14:18 +08:00
姜玉琦 d525dcd0a6 提交代码 2024-04-06 13:55:01 +08:00
姜玉琦 1dc7cdf4f3 提交代码 2024-04-06 01:31:14 +08:00
姜玉琦 6e84af4b01 提交 2024-04-05 19:26:28 +08:00
姜玉琦 cbec808a2e 提交代码 2024-04-05 19:25:29 +08:00
姜玉琦 cf74666de8 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-03 01:47:09 +08:00
姜玉琦 8b751cd807 提交代码 2024-04-03 01:47:02 +08:00
haha 46a9633e89 update code 2024-04-01 23:37:58 +08:00
haha 049d84a73b update code 2024-04-01 22:37:40 +08:00
姜玉琦 f974e753d1 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-31 23:42:08 +08:00
姜玉琦 ea6ee3af97 提交代码 2024-03-31 23:42:01 +08:00
haha fb02b1a244 update code 2024-03-31 23:40:18 +08:00
姜玉琦 3ceb360237 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-31 23:32:09 +08:00
姜玉琦 f57eb151db 提交代码 2024-03-31 23:32:00 +08:00
haha 18285da559 update code 2024-03-31 23:02:00 +08:00
haha 8bd551dce8 update code 2024-03-30 22:20:24 +08:00
haha 47bc7fe61a update code 2024-03-30 00:04:23 +08:00
haha ff87c12d35 update code 2024-03-29 00:19:44 +08:00
姜玉琦 6d76c84442 1 2024-03-28 23:29:23 +08:00
姜玉琦 10ee8994c2 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-28 23:20:41 +08:00
姜玉琦 8b06d3e889 提交代码 2024-03-28 23:20:28 +08:00
haha 8a49d3f250 update code 2024-03-28 22:02:25 +08:00
姜玉琦 b21bbf095d Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-28 13:24:57 +08:00
姜玉琦 9fc9b9e3b2 提交代码 2024-03-28 13:23:41 +08:00
haha 936d499927 update code 2024-03-28 00:10:50 +08:00
haha 9c7a500916 update code 2024-03-26 02:05:09 +08:00
haha e2524e4bdf update code 2024-03-26 01:44:19 +08:00
姜玉琦 8edb022406 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-26 01:13:28 +08:00
姜玉琦 be10111f98 提交代码 2024-03-26 01:13:20 +08:00
haha 1be2c0e05c update code 2024-03-26 01:13:02 +08:00
haha 745f2ee510 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-26 01:06:17 +08:00
haha a88422a963 update code 2024-03-26 01:05:54 +08:00
姜玉琦 cdcefab554 提交代码 2024-03-26 00:51:10 +08:00
haha 4b9a42c288 update code 2024-03-25 23:43:54 +08:00
haha 0afd1137bb update code 2024-03-24 23:44:10 +08:00
姜玉琦 05b4938827 提交代码 2024-03-24 23:39:57 +08:00
haha cb0cb1fce7 update code 2024-03-23 22:51:05 +08:00
haha 41a8a5179d update code 2024-03-23 18:32:18 +08:00
姜玉琦 5c90be5110 提交代码 2024-03-23 03:30:53 +08:00
姜玉琦 04004b10ee Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 03:15:13 +08:00
姜玉琦 1693ba2efc 提交代码 2024-03-23 03:15:07 +08:00
haha d67247be37 update code 2024-03-23 03:02:33 +08:00
姜玉琦 25aa45ba70 提交代码 2024-03-23 02:44:12 +08:00
姜玉琦 b44d75bf37 提交代码 2024-03-23 02:42:31 +08:00
姜玉琦 0f8e5522cd Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 02:29:57 +08:00
姜玉琦 56c53fb4ab 提交代码 2024-03-23 02:29:51 +08:00
haha 4627b967c0 update code 2024-03-23 02:28:39 +08:00
haha b5110ca8e6 update code 2024-03-23 02:17:39 +08:00
haha 9bade2237e update code 2024-03-23 01:33:04 +08:00
haha ce59957910 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 01:27:34 +08:00
haha 32b5398830 update code 2024-03-23 01:27:13 +08:00
姜玉琦 5e6933cc3d 提交代码 2024-03-23 01:02:55 +08:00
姜玉琦 f5205e4dba Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 00:59:15 +08:00
姜玉琦 6c2eb7ee27 体哦 2024-03-23 00:59:08 +08:00
haha ae8e44db92 update code 2024-03-23 00:57:06 +08:00
姜玉琦 be9b9b3846 提交代码 2024-03-23 00:26:46 +08:00
haha 007804ab37 update code 2024-03-23 00:22:47 +08:00
姜玉琦 d5fbe11cc9 提交代码 2024-03-23 00:17:15 +08:00
姜玉琦 378f6da4a3 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev
# Conflicts:
#	yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
2024-03-23 00:14:22 +08:00
姜玉琦 8427bd6235 提交代码 2024-03-23 00:11:55 +08:00
haha e5d1c14842 update code 2024-03-22 23:44:12 +08:00
haha 5978c46fc0 update code 2024-03-22 22:44:32 +08:00
haha 6edebbef77 update code 2024-03-22 22:00:33 +08:00
haha 17d7b923e2 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-22 21:59:10 +08:00
姜玉琦 b679930530 提交 2024-03-22 01:23:53 +08:00
姜玉琦 ad4692ea79 提交 2024-03-22 01:09:31 +08:00
haha 6886d5b521 update code 2024-03-22 00:25:31 +08:00
姜玉琦 cf1bbc65a8 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-21 23:12:02 +08:00
姜玉琦 391d800ea9 提交代码 2024-03-21 23:11:55 +08:00
haha 346b3e1443 update code 2024-03-21 23:09:58 +08:00
haha 978434df1f update code 2024-03-20 23:38:25 +08:00
姜玉琦 1b8fb5fac3 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-17 17:00:20 +08:00
姜玉琦 10aa8b23a7 提交代码 2024-03-17 17:00:12 +08:00
haha e1e82f7796 update code 2024-03-16 15:29:07 +08:00
haha 9f80befa1a update code 华筑考勤无效数据不入库 2024-03-16 14:39:54 +08:00
haha 6afbc7d937 update code 2024-03-16 00:02:59 +08:00
haha 6ed84b9dad 增加济工考勤 2024-03-15 23:25:37 +08:00
haha 09de575360 update code 2024-03-14 23:11:14 +08:00
haha 9566d0e9c6 update code 2024-03-14 22:36:26 +08:00
姜玉琦 7b40942bcc 提交代码 2024-03-14 13:51:55 +08:00
姜玉琦 ca690cb5e6 提交代码 2024-03-12 14:10:18 +08:00
姜玉琦 9b73add815 提交代码 2024-03-11 00:56:19 +08:00
姜玉琦 aaab711287 提交 2024-03-09 19:49:30 +08:00
haha 684c088d56 update code 2024-03-06 22:43:19 +08:00
姜玉琦 feb864da4a 提交代码 2024-03-03 23:34:45 +08:00
haha c6e886cd40 update code 2024-03-01 23:34:15 +08:00
姜玉琦 aa9ad12c7d 提交代码 2024-02-17 14:19:29 +08:00
姜玉琦 e3933ca4d9 提交代码 2024-02-17 13:37:47 +08:00
haha 62a7807720 update code 2024-02-01 23:05:24 +08:00
haha 88326fad41 update code 2024-01-31 22:44:45 +08:00
haha 017d41b96c update code 2024-01-26 22:45:20 +08:00
haha 85b8ed616a update code 2024-01-25 22:51:56 +08:00
姜玉琦 b6a04edec9 提交 2024-01-22 11:14:43 +08:00
姜玉琦 de2042e0b9 提交代码 2024-01-22 10:28:43 +08:00
姜玉琦 ca300ff472 提交代码 2024-01-22 02:47:42 +08:00
姜玉琦 f845d6e42f 提交代码 2024-01-21 22:47:57 +08:00
姜玉琦 64b66015aa 提交代码 2024-01-21 20:09:16 +08:00
姜玉琦 15fe949a59 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-01-21 16:50:58 +08:00
姜玉琦 76014fbd94 提交代码 2024-01-21 16:50:44 +08:00
haha 67b00fba13 update code 2024-01-21 16:24:09 +08:00
haha 7e62fc42fc update code 2024-01-19 23:38:45 +08:00
haha fd1ea49ae0 update code 2024-01-19 00:22:29 +08:00
haha c5193f0c10 update code 2024-01-17 23:58:43 +08:00
haha f0ddfdc118 update code 2024-01-16 22:54:21 +08:00
haha 003921c7b3 update code 2024-01-16 21:39:51 +08:00
haha d3a510731d update code 2024-01-14 23:18:41 +08:00
haha 5570eb7be7 update code 2024-01-14 22:03:38 +08:00
姜玉琦 df08d716a7 提交代码 2024-01-14 21:24:01 +08:00
姜玉琦 d49091a697 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-01-14 02:34:33 +08:00
姜玉琦 287d860c8f 提交代码 2024-01-14 02:34:07 +08:00
haha 5dc0224f96 update code 2024-01-13 23:38:14 +08:00
姜玉琦 b529cf5946 提交代码 2024-01-13 19:53:42 +08:00
haha 93b207a1dc update code 2024-01-13 00:03:25 +08:00
haha d8edf04fa7 update code 2024-01-12 00:31:02 +08:00
haha fa8140c80c update code 2024-01-11 23:11:51 +08:00
姜玉琦 d6a7af16d9 提交代码 2023-12-25 00:54:07 +08:00
姜玉琦 4ab19823f0 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-12-22 23:36:08 +08:00
姜玉琦 b7844e3d3f 提交代码 2023-12-22 23:36:01 +08:00
haha cfc468ac1f update code 2023-12-13 22:14:10 +08:00
姜玉琦 287f532189 提交代码 2023-12-13 02:36:04 +08:00
姜玉琦 e85796bf6d Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-12-01 23:00:41 +08:00
姜玉琦 7b5b18bbd3 提交代码 2023-12-01 23:00:35 +08:00
haha fb247b77df update code 2023-11-29 21:19:47 +08:00
姜玉琦 e546f71cce 代码提交 2023-11-26 11:58:55 +08:00
姜玉琦 dbb809777c 提交代码 2023-11-21 00:05:42 +08:00
姜玉琦 8139308f82 提交代码 2023-11-19 23:49:35 +08:00
姜玉琦 75b93ff7f0 提交 2023-11-11 10:12:04 +08:00
姜玉琦 62b7a8bdd2 代码提交 2023-11-09 00:51:12 +08:00
haha 423d77a86c update code 2023-11-06 00:02:19 +08:00
姜玉琦 c470afad2a 提交 2023-11-05 23:58:38 +08:00
姜玉琦 5763cd2855 提交代码 2023-11-02 23:04:34 +08:00
姜玉琦 60f8ab935f 提交代码 2023-10-27 00:44:12 +08:00
姜玉琦 26bd6af26d 提交代码 2023-10-27 00:43:37 +08:00
姜玉琦 b9fc0025b2 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-10-23 01:35:09 +08:00
姜玉琦 31bb5ef630 提交代码 2023-10-23 01:35:04 +08:00
haha 0fe04687f7 update code 2023-10-22 23:45:32 +08:00
姜玉琦 b1efceb675 提交代码 2023-10-20 17:55:52 +08:00
姜玉琦 2a8ee698d8 提交代码 2023-10-18 01:00:46 +08:00
haha 10c34adf17 update code 2023-10-16 23:52:32 +08:00
haha 190e6b8bc5 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-10-16 19:44:58 +08:00
haha 7a4f736b2d update code 2023-10-16 19:44:43 +08:00
姜玉琦 8af61d5b99 提交代码 2023-10-16 00:36:24 +08:00
姜玉琦 cab52bcc01 提交代码 2023-10-16 00:00:25 +08:00
haha 3564e8926d Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-10-15 20:36:39 +08:00
haha 995b7e88d6 update code 2023-10-15 20:35:48 +08:00
姜玉琦 a384c08c10 提交代码 2023-10-15 15:43:34 +08:00
haha c1159de712 update code 2023-10-15 00:26:07 +08:00
haha 624707bd1e update code 2023-10-14 19:51:45 +08:00
姜玉琦 056dbef838 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-10-14 18:28:38 +08:00
姜玉琦 defe0080fa 提交代码 2023-10-14 18:28:33 +08:00
haha 88c34f9260 Merge branch 'dev-login' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-10-13 23:58:48 +08:00
姜玉琦 ded2d46796 提交了 2023-10-13 23:57:52 +08:00
姜玉琦 4fa4c19b62 提交代码 2023-10-13 04:00:58 +08:00
姜玉琦 d7e13004b2 提交代码 2023-10-12 03:53:40 +08:00
haha 334cfae105 update code 2023-10-11 23:48:11 +08:00
haha 5fd792ded5 update code 2023-10-11 23:24:45 +08:00
haha 0036578c0e update code 2023-10-07 21:59:57 +08:00
姜玉琦 180ff53331 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-10-07 01:31:38 +08:00
姜玉琦 b9e62739ea 提交代码 2023-10-07 01:31:27 +08:00
haha 96163b4c9e update code 2023-10-07 00:48:44 +08:00
haha 56be8f69c9 update code 2023-09-30 23:03:37 +08:00
haha f2dce819a3 update code 2023-09-29 23:31:21 +08:00
姜玉琦 b899f57109 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-09-29 01:08:32 +08:00
姜玉琦 910b277071 提交代码 2023-09-29 01:08:26 +08:00
haha 20a142626e update code 2023-09-29 00:24:15 +08:00
haha c281a11886 update code 2023-09-27 00:37:24 +08:00
姜玉琦 ac05a76efe 提交代码 2023-09-28 00:36:36 +08:00
haha 88d671d50b update code 2023-09-27 00:09:47 +08:00
姜玉琦 a251af1189 提交代码 2023-09-26 23:51:32 +08:00
姜玉琦 09b0a22862 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-09-26 23:49:03 +08:00
姜玉琦 5278145ffd 提交代码 2023-09-26 23:48:57 +08:00
haha 3ab35b0d15 update code 2023-09-26 00:01:20 +08:00
haha e0f32fb7df update code 2023-09-25 00:32:36 +08:00
姜玉琦 02e676c6a7 提交代码 2023-09-24 21:47:06 +08:00
haha 97a20c7350 update code 2023-09-24 18:35:52 +08:00
姜玉琦 1d87ebfad3 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2023-09-24 16:36:20 +08:00
姜玉琦 a9467e2ad0 提交代码 2023-09-24 16:36:02 +08:00