Commit Graph

1147 Commits

Author SHA1 Message Date
wujj 2e8a6d9817 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pom.xml
#	src/main/resources/application.yml
2020-11-03 18:13:24 +08:00
wujj 55b338db4e init 2020-11-03 18:10:24 +08:00
wujj c1b81d0dab Merge remote-tracking branch 'origin/5.2'
# Conflicts:
#	doc/mcms-5.1.sql
#	pom.xml
2020-11-03 17:49:29 +08:00
xierz 1a95a6978e 栏目分类新增拼音 2020-11-03 14:46:18 +08:00
wujj 62c2ebdfb0 Merge remote-tracking branch 'origin/5.2' into 5.2 2020-11-03 13:44:47 +08:00
wujj 5aeaac32c9 清理 2020-11-03 13:44:35 +08:00
guwd 0bd341644f 抽取ms-db 2020-11-03 13:41:24 +08:00
guwd 8b9cf07b70 抽取ms-db 2020-11-03 13:30:54 +08:00
xierz 14b2d5db6b 修改栏目-父节点判断
修改栏目-更新父节点叶子状态方式
新增栏目-新增栏目一定是叶子节点
2020-11-03 12:08:56 +08:00
sgjj d68b4dd9e0 调整配置 2020-11-02 16:46:41 +08:00
sgjj 8f5b0adfe2 修改别名 2020-11-02 16:24:14 +08:00
sgjj 64a749e153 添加别名 2020-11-02 16:17:30 +08:00
sgjj c3f132bef1 达梦链接 2020-11-02 09:48:38 +08:00
sgjj 1e6ebdcc4a Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-31 11:18:03 +08:00
sgjj a50f0f7b55 抽离多租户 2020-10-31 11:16:27 +08:00
wujj 2bc41123eb Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-31 10:48:13 +08:00
wujj 8c0b4a50b1 SQL文件 2020-10-31 10:48:00 +08:00
xierz 86d7d29bff Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-31 10:47:51 +08:00
xierz 68cce8c42b 更改文章删除方式 2020-10-31 10:47:40 +08:00
sgjj 4748d53ab3 Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-31 10:34:23 +08:00
xierz 2f2f9ddf3c 栏目删除更改id类型 2020-10-31 10:21:42 +08:00
sgjj 3d34aa5937 添加更新sql 2020-10-31 10:19:38 +08:00
xierz 8db9504a60 5.2升级包 2020-10-30 18:12:21 +08:00
sgjj aa5bd09acf 修改烂机器 2020-10-30 16:07:00 +08:00
wujj 2e665bec50 pom 提交 2020-10-30 14:58:11 +08:00
xierz 9b949b8b1c 更改常量APP_ID 2020-10-30 10:42:04 +08:00
sgjj 6b271adb96 恢复代码 2020-10-30 10:34:53 +08:00
sgjj 8f6ff12dfb 去除appId依赖 2020-10-30 10:04:54 +08:00
sgjj 0f5828d47d 撤回提交 2020-10-29 14:50:29 +08:00
sgjj 15141de31e 更新sql 2020-10-29 14:44:58 +08:00
sgjj 9345bdb426 添加配置 2020-10-29 14:43:35 +08:00
sgjj 4682b0ca51 添加雪花主键 2020-10-29 14:39:59 +08:00
sgjj 1c16536ff1 Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-29 11:56:54 +08:00
wujj 37cffefb0d 模板 2020-10-29 11:44:00 +08:00
wujj 3ffe552ffb Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-28 18:12:47 +08:00
wujj ef77f3989b 模板 2020-10-28 18:12:24 +08:00
sgjj f28a00e507 mybatis-plus配置 2020-10-28 15:45:38 +08:00
sgjj 1d2d13d859 添加字段 2020-10-28 15:40:12 +08:00
sgjj 379bd0084b 调整规范 2020-10-28 15:33:06 +08:00
guwd c4d4dadd24 模版路径 2020-10-27 09:29:27 +08:00
xierz 7b6f63aed9 自定义字典数据库字段默认值 2020-10-26 10:20:10 +08:00
xierz 70393e190f 任务调度静态化 2020-10-24 11:34:22 +08:00
xierz e1544f0932 采集测试启动停止 2020-10-23 18:32:15 +08:00
xierz be9263c002 静态化任务调度 2020-10-23 17:56:03 +08:00
wujj b3fdd1fc09 升级 2020-10-23 15:10:20 +08:00
wujj a99a728384 配置 2020-10-22 15:05:22 +08:00
wujj 77f63cee5e 资源 2020-10-22 10:24:36 +08:00
wujj f6184c03f1 资源更新 2020-10-22 10:21:10 +08:00
wujj 9cfa373003 sql 2020-10-21 18:18:13 +08:00
wujj 1edf89e4af Merge remote-tracking branch 'origin/5.2' into 5.2 2020-10-21 15:51:39 +08:00