Merge branch 'dev'

# Conflicts:
#	msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml

msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml

@@ -95,23 +95,15 @@ msgpush:
     title: 推送后台
     description: 消息推送的所有功能
     version: ${msgpush.info.version}
+  codegen:
+    base-package: com.njcn.msgpush
+    db-schemas: ${spring.datasource.dynamic.datasource.master.name}
+    front-type: 20 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类
+    vo-type: 10 # VO 的类型，参见 CodegenVOTypeEnum 枚举类
+    delete-batch-enable: true # 是否生成批量删除接口
+    unit-test-enable: false # 是否生成单元测试
+
 
 debug: false
 
-aliyun:
-  sms:
-    access-key-id: LTAI4FxsR76x2dq3w9c5puUe
-    access-key-secret: GxkTR8fsrvHtixTlD9UPmOGli35tZs
-    regionId: cn-hangzhou
-    endpoint: dysmsapi.aliyuncs.com
-  mail:
-    access-key-id: LTAI4FxsR76x2dq3w9c5puUe
-    access-key-secret: GxkTR8fsrvHtixTlD9UPmOGli35tZs
-    regionId: cn-hangzhou
-    endpoint: dm.aliyuncs.com
-
-telecom:
-  sms:
-    account: 925631
-    password: AMW2pOVrdky