jinhaiyang
|
403303289e
|
fix
|
2024-04-17 21:55:35 +08:00 |
|
chenwenjian
|
001014791b
|
Merge remote-tracking branch 'origin/feature/REQ-2106' into feature/REQ-2106
|
2024-04-17 21:52:16 +08:00 |
|
chenwenjian
|
beb9bcbca4
|
feat(REQ-2106): 项目部或岗位字段拼接
|
2024-04-17 21:51:46 +08:00 |
|
jinhaiyang
|
e6ee938c9a
|
fix
|
2024-04-17 21:46:32 +08:00 |
|
jinhaiyang
|
978f8761d1
|
fix
|
2024-04-17 21:35:43 +08:00 |
|
chenwenjian
|
15b49b18ca
|
feat(REQ-2106): 更新操作人查询
|
2024-04-17 20:48:42 +08:00 |
|
chenwenjian
|
82cafe61af
|
feat(REQ-2106): 更新操作人查询
|
2024-04-17 20:11:23 +08:00 |
|
chenwenjian
|
67bd674bca
|
feat(REQ-2106): Time->Long
|
2024-04-17 19:32:16 +08:00 |
|
金海洋
|
9ea276ab61
|
Merge branch 'feature/REQ-2212' into 'master'
Feature/req 2212
See merge request universal/infrastructure/backend/nanopart!31
|
2024-04-17 08:44:42 +00:00 |
|
chenwenjian
|
48d66b8b12
|
Merge branch 'master' into feature/REQ-2212
# Conflicts:
# black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/constant/BlackAndWhiteListConstant.java
|
2024-04-17 16:41:53 +08:00 |
|
金海洋
|
d85c81e163
|
Merge branch 'feature/REQ-1979' into 'master'
Feature/req 1979
See merge request universal/infrastructure/backend/nanopart!29
|
2024-04-17 06:35:24 +00:00 |
|
zhangran
|
c012ba95ce
|
fix-移除部分未使用的方法
|
2024-04-17 14:33:04 +08:00 |
|
chenwenjian
|
29c0fb950d
|
feat(REQ-2106): Time->Long
|
2024-04-17 13:36:20 +08:00 |
|
chenwenjian
|
cfed4d69fd
|
feat(REQ-2106): 联调优化
1. banner详情展示时间段格式调整
2. 素材详情展示终端字段返回
|
2024-04-17 13:04:31 +08:00 |
|
chenwenjian
|
cfafafe137
|
feat(REQ-2106): 操作系统版本枚举值调整
|
2024-04-16 15:05:20 +08:00 |
|
chenwenjian
|
74789207bc
|
feat(REQ-2106): 版本更新提示返回jumpUrl
|
2024-04-16 14:18:31 +08:00 |
|
chenwenjian
|
9cc2c60ca9
|
feat(REQ-2106): 调整jumpUrl类型和格式
JSONObject->JSONArray
|
2024-04-16 12:32:42 +08:00 |
|
chenwenjian
|
60a0df3447
|
feat(REQ-2106): 素材创建新增materialType字段
|
2024-04-15 11:45:08 +08:00 |
|
chenwenjian
|
55ad56eaa8
|
feat(REQ-2106): 新增广告位展示时间类型枚举
|
2024-04-12 18:21:49 +08:00 |
|
chenwenjian
|
d547a76cc3
|
feat(REQ-2106): 版本更新记录personId不能为空
|
2024-04-12 13:41:38 +08:00 |
|
chenwenjian
|
e1847e5fe5
|
feat(REQ-2106): 版本更新提示已读记录
|
2024-04-12 11:01:38 +08:00 |
|
chenwenjian
|
254f8e9ecc
|
feat(REQ-2106): 版本更新提示已读记录
|
2024-04-12 11:01:32 +08:00 |
|
chenwenjian
|
f70fb17dd1
|
feat(REQ-2106): 接口自测优化
|
2024-04-11 19:02:20 +08:00 |
|
chenwenjian
|
e04a66daca
|
feat(REQ-2106): 接口实现完成
|
2024-04-11 10:52:23 +08:00 |
|
chenwenjian
|
b14d242f95
|
feat(REQ-2212): 临时处理
|
2024-04-10 16:12:42 +08:00 |
|
chenwenjian
|
c2ba6dde14
|
Merge branch 'master' into feature/REQ-2106
# Conflicts:
# nanopart-server/src/main/java/cn/axzo/nanopart/NanopartApplication.java
# pom.xml
|
2024-04-10 15:44:36 +08:00 |
|
chenwenjian
|
693b420f12
|
feat(REQ-2106): 临时提交
|
2024-04-10 15:16:57 +08:00 |
|
金海洋
|
ce65586d7b
|
Merge branch 'feature-REQ/2129' into 'master'
Feature req/2129
See merge request universal/infrastructure/backend/nanopart!24
|
2024-04-10 05:47:33 +00:00 |
|
lilong
|
8abf00079a
|
feat: 修改全员发送时的bug
|
2024-04-09 17:20:51 +08:00 |
|
zhangran
|
18ecc95e39
|
fix-删除xxljob
|
2024-04-08 21:16:04 +08:00 |
|
chenwenjian
|
8d7ce2f1ab
|
feat(REQ-2106): 时间类型调整
|
2024-04-08 18:08:32 +08:00 |
|
chenwenjian
|
9870e704fb
|
feat(REQ-2106): 新增素材类型字段
|
2024-04-08 14:03:02 +08:00 |
|
zhangran
|
a8bdb400e5
|
add-更换xxljob
|
2024-04-08 13:56:04 +08:00 |
|
chenwenjian
|
ab0abf5010
|
feat(REQ-2106): personId临时允许为空
|
2024-04-08 11:08:22 +08:00 |
|
chenwenjian
|
1b243ec100
|
feat(REQ-2106): localDateTime-》Date
|
2024-04-08 10:52:25 +08:00 |
|
chenwenjian
|
02602d1f5d
|
feat(REQ-2106): import类型调整
|
2024-04-07 18:55:01 +08:00 |
|
chenwenjian
|
33c7d71225
|
feat(REQ-2106): 临时调试
|
2024-04-07 18:37:34 +08:00 |
|
chenwenjian
|
8d3c11c613
|
feat(REQ-2106): dao->mapper
|
2024-04-07 18:09:14 +08:00 |
|
chenwenjian
|
6577e8d0dc
|
feat(REQ-2106): ApplicationVersion相关接口实现
|
2024-04-07 16:50:42 +08:00 |
|
chenwenjian
|
2001387000
|
feat(REQ-2106): Material相关接口实现完成
|
2024-04-07 15:45:31 +08:00 |
|
chenwenjian
|
96b0128ef4
|
feat(REQ-2106): Banner相关接口实现完成
|
2024-04-07 14:12:49 +08:00 |
|
lilong
|
86ec567ed4
|
feat: 修改page查询的数据状态被修改的问题，page写成第一页
|
2024-04-07 10:12:12 +08:00 |
|
chenwenjian
|
621a7e48c4
|
feat(REQ-2106): 获取版本更新提示弹窗内容
|
2024-04-06 15:47:42 +08:00 |
|
chenwenjian
|
4eb7439631
|
feat(REQ-2106): 获取版本更新提示弹窗内容
|
2024-04-05 22:26:06 +08:00 |
|
chenwenjian
|
54d9a70384
|
feat(REQ-2106): 广告位新增字段
|
2024-04-05 21:12:24 +08:00 |
|
chenwenjian
|
827e151c0d
|
feat(REQ-2106): 广告位相关基本接口实现-去除未用到的引用对象
|
2024-04-05 16:42:42 +08:00 |
|
chenwenjian
|
7edd86e2a4
|
feat(REQ-2106): 广告位相关基本接口实现
|
2024-04-05 16:41:20 +08:00 |
|
chenwenjian
|
3faa4ee3ba
|
feat(REQ-2106): 广告位相关基本接口实现
|
2024-04-05 16:41:03 +08:00 |
|
chenwenjian
|
58673725c9
|
feat(REQ-2106): 接口Controller
|
2024-04-03 16:41:01 +08:00 |
|
chenwenjian
|
7f578c01e8
|
feat(REQ-2106): 添加@PostMapping注解
|
2024-04-03 16:16:23 +08:00 |
|