Commit Graph

903 Commits

Author SHA1 Message Date
xudawei
61f3e4c733 [REQ-2348] 节点用户创建添加consumer 2024-08-06 18:24:03 +08:00
金海洋
f377af689d Merge branch 'feature/REQ-2539' into 'master'
Feature/req 2539

See merge request universal/infrastructure/backend/nanopart!42
2024-08-06 08:46:57 +00:00
chenwenjian
f7ebc2524b Merge branch 'master' into feature/REQ-2539 2024-08-01 10:50:28 +08:00
金海洋
b1def74668 Merge branch 'feature/arthas' into 'master'
Feature/arthas

See merge request universal/infrastructure/backend/nanopart!41
2024-07-31 05:58:03 +00:00
chenwenjian
3a8f5aaee9 feat(arthas): 新增耗时分析日志 2024-07-30 10:46:45 +08:00
chenwenjian
401c0b8db8 feat(arthas): 新增arthas 2024-07-24 21:08:49 +08:00
chenwenjian
9655ee1452 feat(REQ-2539): url格式简单校验 2024-07-22 15:11:24 +08:00
金海洋
645d176ef1 Merge branch 'feature/REQ-2545' into 'master'
feat(REQ-2545): 概念名词替换

See merge request universal/infrastructure/backend/nanopart!39
2024-07-22 02:51:55 +00:00
chenwenjian
636e9d0f8b feat(REQ-2545): 概念名词替换
工程项目-》工程
项目部-》项目
2024-07-22 10:29:59 +08:00
chenwenjian
161930fd59 feat(REQ-2539): 自动映射 2024-07-18 10:06:04 +08:00
chenwenjian
9b0c6f2022 feat(REQ-2539): 逻辑微调 2024-07-17 20:52:58 +08:00
chenwenjian
9c3ebf942e feat(REQ-2539): BaseEntity包替换 2024-07-17 19:11:59 +08:00
金海洋
fedf5d7c9f Merge branch 'feature/REQ-2559' into 'master'
REQ-2559 图纸识别数据展示

See merge request universal/infrastructure/backend/nanopart!38
2024-07-17 03:18:38 +00:00
chenwenjian
278105183c feat(REQ-2539): 新增.reviewboardrc文件 2024-07-15 18:17:50 +08:00
chenwenjian
431672e442 feat(REQ-2539): 帮助中心相关接口基本实现 2024-07-15 18:12:03 +08:00
王思谦
e948fee558 REQ-2559 fix bugs 2024-07-08 18:24:07 +08:00
王思谦
8927eaf98a REQ-2559 完善config,支持后端 2024-07-08 10:18:22 +08:00
金海洋
24b9ffb820 Merge branch 'feature/REQ-2186' into 'master'
Feature/req 2186

See merge request universal/infrastructure/backend/nanopart!37
2024-06-05 11:15:55 +00:00
xudawei
07107fe1fe fix-checkstyle 2024-06-05 09:34:20 +08:00
xudawei
44b386c88d Merge branch 'master' into feature/REQ-2186 2024-06-05 09:32:21 +08:00
金海洋
d8891bb72a Merge branch 'hotfix/20240515' into 'master'
Hotfix/20240515

See merge request universal/infrastructure/backend/nanopart!36
2024-05-15 09:15:44 +00:00
chenwenjian
7ce6b70c65 fix(fix): 工人未加入任何项目部/单位,导致的NPE问题处理 2024-05-15 16:36:28 +08:00
chenwenjian
a22918fdd3 feat(REQ-2106): 按照项目部投放素材日志打印调整 2024-05-15 16:28:33 +08:00
xudawei
7ff1bf1578 批量查询字典返回ApiResult 2024-05-09 14:55:07 +08:00
金海洋
bf1d8b897e Merge branch 'feature/REQ-2106' into 'master'
Feature/req 2106

See merge request universal/infrastructure/backend/nanopart!35
2024-05-08 08:22:32 +00:00
chenwenjian
f7b615a426 feat(REQ-2106): 按照项目部投放素材日志打印调整 2024-05-07 15:10:22 +08:00
chenwenjian
ddb77fe31d feat(REQ-2106): 按照项目部投放素材日志打印调整 2024-05-07 14:40:44 +08:00
xudawei
509f390fd8 增加字典模块-更改校验message 2024-05-06 14:16:01 +08:00
xudawei
8833fc5a78 增加字典模块-表名axzo_dictionary更新成nanopart_dictionary 2024-05-06 11:51:46 +08:00
xudawei
8a9e52baf6 增加字典模块-增加批量查询接口 2024-05-06 11:00:20 +08:00
xudawei
099fdb2fee 增加字典模块-pom.xml版本添加 2024-04-29 18:02:30 +08:00
xudawei
de5ccdf2d9 增加字典模块 2024-04-29 17:56:36 +08:00
金海洋
bddc8c3e3c Merge branch 'feature/REQ-2106' into 'master'
feat(REQ-2106): 创建广告位提示调整

See merge request universal/infrastructure/backend/nanopart!34
2024-04-24 12:58:48 +00:00
chenwenjian
a7899b9ed4 feat(REQ-2106): 创建广告位提示调整 2024-04-24 20:56:43 +08:00
金海洋
ec1712c040 Merge branch 'feature/REQ-2106' into 'master'
Feature/req 2106

See merge request universal/infrastructure/backend/nanopart!33
2024-04-24 09:28:01 +00:00
chenwenjian
aeaf05fc68 feat(REQ-2106): 素材创建名称长度限制 2024-04-23 10:10:56 +08:00
chenwenjian
b37f3b5882 feat(REQ-2106): 显示频次限制调整 2024-04-22 18:48:32 +08:00
chenwenjian
159be816e1 Merge branch 'master' into feature/REQ-2106
# Conflicts:
#	banner/banner-api/src/main/java/cn/axzo/nanopart/api/ApplicationVersionApi.java
#	banner/banner-api/src/main/java/cn/axzo/nanopart/api/BannerApi.java
#	banner/banner-api/src/main/java/cn/axzo/nanopart/api/BannerOperationLogApi.java
#	banner/banner-api/src/main/java/cn/axzo/nanopart/api/MaterialApi.java
#	banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/ApplicationVersionController.java
#	banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/BannerController.java
#	banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/BannerOperationLogController.java
#	banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/MaterialController.java
2024-04-22 18:17:19 +08:00
chenwenjian
37160cf5ae feat(REQ-2106): NO_LIMIT频次key调整 2024-04-22 18:05:07 +08:00
chenwenjian
77f066c9c1 feat(REQ-2106): 注释补充 2024-04-22 16:16:36 +08:00
chenwenjian
1fb1551dfd feat(REQ-2106): 注释规范化 2024-04-22 15:47:14 +08:00
chenwenjian
965f64342f feat(REQ-2106): 广告位和素材操作日志时间筛选选用updateAt字段 2024-04-22 14:59:30 +08:00
chenwenjian
aadeaf42d5 feat(REQ-2106): 全部项目部下指定岗位素材投放调整 2024-04-22 13:54:28 +08:00
chenwenjian
cd49e8a326 feat(REQ-2106): 投放日志打印调整 2024-04-22 11:11:52 +08:00
chenwenjian
91b82bc434 feat(REQ-2106): 投放规则调整 2024-04-20 18:15:18 +08:00
chenwenjian
244bae35fc feat(REQ-2106): 调整 2024-04-20 16:55:35 +08:00
chenwenjian
58accea015 feat(REQ-2106): 新增显示频次枚举 2024-04-19 19:57:53 +08:00
chenwenjian
f1769ae115 feat(REQ-2106): 广告位轮播上限和播放时长改为非必填 2024-04-19 14:10:09 +08:00
chenwenjian
77790ffd3a feat(REQ-2106): 更新展示时间段 2024-04-19 13:56:48 +08:00
chenwenjian
3b989a0246 feat(REQ-2106): 素材投放修复 2024-04-19 13:42:50 +08:00