diff --git a/.DS_Store b/.DS_Store
index bf88f27..966a8b6 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/.gitignore b/.gitignore
index 66b37d5..9c5e048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,4 +275,22 @@ __pycache__/
 *.zip
 
 # Cursor IDE files
-.cursor/
\ No newline at end of file
+.cursor/
+
+# 排除无效的 Windows 风格路径（在 Mac 上出现）
+# 排除类似 /D:/wesley/project/git/antis-disk/netcore/src/Modular 的无效路径
+D//
+D//**
+D//**/*
+/D:*
+/D:/**
+/D:/**/*
+
+# macOS 系统文件
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/antis-ncc-admin/.env.development b/antis-ncc-admin/.env.development
index ed2637e..bfa2e32 100644
--- a/antis-ncc-admin/.env.development
+++ b/antis-ncc-admin/.env.development
@@ -1,5 +1,5 @@
 # 开发
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
-VUE_APP_BASE_API = 'http://lvqian.antissoft.com'
+VUE_APP_BASE_API = 'http://192.168.110.45:5000'
 VUE_APP_BASE_WSS = 'ws://localhost:2011/websocket'
diff --git a/antis-ncc-admin/src/views/lqMdMdgs/index.vue b/antis-ncc-admin/src/views/lqMdMdgs/index.vue
index 3731123..af7c403 100644
--- a/antis-ncc-admin/src/views/lqMdMdgs/index.vue
+++ b/antis-ncc-admin/src/views/lqMdMdgs/index.vue
@@ -1,93 +1,72 @@
 <template>
 	<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
+			<!-- 搜索区域 -->
 			<el-row class="NCC-common-search-box" :gutter="16">
 				<el-form @submit.native.prevent>
-					<el-col :span="6">
+					<el-col :span="5">
 						<el-form-item label="门店编码">
-							<el-input v-model="query.id" placeholder="门店编码" clearable />	
+							<el-input 
+								v-model="query.mdbm" 
+								placeholder="请输入门店编码" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="单据门店编号">
-							<el-input v-model="query.djmdbh" placeholder="单据门店编号" clearable />	
+					<el-col :span="5">
+						<el-form-item label="门店名称">
+							<el-input 
+								v-model="query.dm" 
+								placeholder="请输入门店名称" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
+					<el-col :span="5">
 						<el-form-item label="单据门店">
-							<el-input v-model="query.djmd" placeholder="单据门店" clearable />	
-						</el-form-item>
-					</el-col>
-					<template v-if="showAll">
-					<el-col :span="6">
-						<el-form-item label="事业部">
-							<el-select v-model="query.syb" placeholder="事业部" clearable >
-								<el-option v-for="(item, index) in sybOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="教育部">
-							<el-select v-model="query.jyb" placeholder="教育部" clearable >
-								<el-option v-for="(item, index) in jybOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="科技部">
-							<el-select v-model="query.kjb" placeholder="科技部" clearable >
-								<el-option v-for="(item, index) in kjbOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="大项目部">
-							<el-select v-model="query.dxmb" placeholder="大项目部" clearable >
-								<el-option v-for="(item, index) in dxmbOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="归属起始时间">
-							<el-date-picker v-model="query.gsqssj" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="归属终止时间">
-							<el-date-picker v-model="query.gszzsj" type="daterange" value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="修改信息">
-							<el-input v-model="query.xgxx" placeholder="修改信息" />	
+							<el-input 
+								v-model="query.djmd" 
+								placeholder="请输入单据门店" 
+								clearable 
+								prefix-icon="el-icon-search"
+								style="border-radius: 6px;" 
+							/>	
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="门店名称">
-							<el-select v-model="query.mdmc" placeholder="门店名称" clearable >
-								<el-option v-for="(item, index) in mdmcOptions" :key="index" :label="item.fullName" :value="item.id"  />
+					<el-col :span="5">
+						<el-form-item label="新店状态">
+							<el-select 
+								v-model="query.isNewStore" 
+								placeholder="请选择新店状态" 
+								clearable 
+								style="width: 100%; border-radius: 6px;"
+							>
+								<el-option label="新店" :value="true" />
+								<el-option label="老店" :value="false" />
 							</el-select>
 						</el-form-item>
 					</el-col>
-					</template>
-					<el-col :span="6">
+					<el-col :span="4">
 						<el-form-item>
-							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+							<div class="search-buttons" style="height: 32px;">
+								<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+								<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							</div>
 						</el-form-item>
 					</el-col>
 				</el-form>
 			</el-row>
 			<div class="NCC-common-layout-main NCC-flex-main">
 				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增</el-button>
-						<el-button type="text" icon="el-icon-download" @click="exportData()">导出</el-button>
-						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除</el-button>
+					<div class="NCC-common-head-left">
+						<h3 class="NCC-common-head-title">
+							<i class="el-icon-office-building"></i>
+							门店归属管理
+						</h3>
 					</div>
 					<div class="NCC-common-head-right">
 						<el-tooltip effect="dark" content="刷新" placement="top">
@@ -96,133 +75,434 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-                <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="门店编码" align="left" />
-					<el-table-column prop="djmdbh" label="单据门店编号" align="left" />
-					<el-table-column prop="djmd" label="单据门店" align="left" />
-					<el-table-column label="事业部" prop="syb" align="left">
-							<template slot-scope="scope">{{ scope.row.syb | dynamicText(sybOptions) }}</template>
+                <NCC-table 
+					v-loading="listLoading" 
+					:data="list"
+				>
+					<el-table-column prop="mdbm" label="门店编码" align="left" width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<el-tag size="small" type="primary">{{ scope.row.mdbm }}</el-tag>
+						</template>
 					</el-table-column>
-					<el-table-column label="教育部" prop="jyb" align="left">
-							<template slot-scope="scope">{{ scope.row.jyb | dynamicText(jybOptions) }}</template>
+					<el-table-column prop="dm" label="门店名称" align="left" min-width="150" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="store-name">{{ scope.row.dm }}</span>
+						</template>
 					</el-table-column>
-					<el-table-column label="科技部" prop="kjb" align="left">
-							<template slot-scope="scope">{{ scope.row.kjb | dynamicText(kjbOptions) }}</template>
+					<el-table-column prop="djmd" label="单据门店" align="left" width="150" show-overflow-tooltip />
+					<el-table-column label="事业部" prop="syb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.syb" size="small" type="success">
+								{{ getDepartmentName(scope.row.syb, sybOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="教育部" prop="jyb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.jyb" size="small" type="warning">
+								{{ getDepartmentName(scope.row.jyb, jybOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="科技部" prop="kjb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.kjb" size="small" type="info">
+								{{ getDepartmentName(scope.row.kjb, kjbOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
 					</el-table-column>
-					<el-table-column label="大项目部" prop="dxmb" align="left">
-							<template slot-scope="scope">{{ scope.row.dxmb | dynamicText(dxmbOptions) }}</template>
+					<el-table-column label="大项目部" prop="dxmb" align="left" width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.dxmb" size="small" type="danger">
+								{{ getDepartmentName(scope.row.dxmb, dxmbOptions) }}
+							</el-tag>
+							<span v-else class="empty-text">无</span>
+						</template>
 					</el-table-column>
-					<el-table-column prop="gsqssj" label="归属起始时间" align="left" />
-					<el-table-column prop="gszzsj" label="归属终止时间" align="left" />
-					<el-table-column prop="xgxx" label="修改信息" align="left" />
-					<el-table-column label="门店名称" prop="mdmc" align="left">
-							<template slot-scope="scope">{{ scope.row.mdmc | dynamicText(mdmcOptions) }}</template>
+					<el-table-column label="新店状态" align="center" width="100">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.isNewStore" type="success" size="small">
+								<i class="el-icon-star-on"></i> 新店
+							</el-tag>
+							<el-tag v-else type="info" size="small">
+								<i class="el-icon-star-off"></i> 老店
+							</el-tag>
+						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+					<el-table-column label="操作" fixed="right" width="200" align="center">
+						<template slot-scope="scope">
+							<el-button 
+								type="text" 
+								icon="el-icon-edit" 
+								@click="editHandle(scope.row)"
+								class="action-btn"
+							>
+								编辑
+							</el-button>
+							<el-button 
+								type="text" 
+								icon="el-icon-view" 
+								@click="viewHandle(scope.row)"
+								class="action-btn"
+							>
+								查看
+							</el-button>
 						</template>
 					</el-table-column>
 				</NCC-table>
                 <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData" />
             </div>
         </div>
-		<NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
-		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<!-- 编辑弹窗 -->
+		<el-dialog 
+			:title="dialogTitle" 
+			:visible.sync="dialogVisible" 
+			width="700px" 
+			:close-on-click-modal="false"
+			:before-close="handleClose"
+			class="store-dialog"
+		>
+			<div class="dialog-header">
+				<div class="store-info">
+					<i class="el-icon-office-building"></i>
+					<span class="store-name">{{ editForm.dm }}</span>
+					<el-tag size="small" type="primary">{{ editForm.mdbm }}</el-tag>
+				</div>
+			</div>
+			<el-form :model="editForm" :rules="editRules" ref="editForm" label-width="120px" class="edit-form">
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="事业部" prop="syb">
+							<el-select 
+								v-model="editForm.syb" 
+								placeholder="请选择事业部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in sybOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="教育部" prop="jyb">
+							<el-select 
+								v-model="editForm.jyb" 
+								placeholder="请选择教育部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in jybOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="12">
+						<el-form-item label="科技部" prop="kjb">
+							<el-select 
+								v-model="editForm.kjb" 
+								placeholder="请选择科技部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in kjbOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
+						<el-form-item label="大项目部" prop="dxmb">
+							<el-select 
+								v-model="editForm.dxmb" 
+								placeholder="请选择大项目部" 
+								clearable 
+								style="width: 100%;"
+								filterable
+							>
+								<el-option 
+									v-for="item in dxmbOptions" 
+									:key="item.Id" 
+									:label="item.FullName" 
+									:value="item.Id"
+								>
+									<span style="float: left">{{ item.FullName }}</span>
+									<span style="float: right; color: #8492a6; font-size: 13px">{{ item.EnCode }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="handleClose" :disabled="saveLoading">取消</el-button>
+				<el-button type="primary" @click="saveEdit" :loading="saveLoading">
+					<i class="el-icon-check"></i> 保存
+				</el-button>
+			</div>
+		</el-dialog>
+
 	</div>
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import NCCForm from './Form'
-    import ExportBox from './ExportBox'
-    import { previewDataInterface } from '@/api/systemData/dataInterface'
 	export default {
-        components: { NCCForm, ExportBox },
         data() {
             return {
-                showAll: false,
 				query: {
-                    id:undefined,
-                    djmdbh:undefined,
-                    djmd:undefined,
-                    syb:undefined,
-                    jyb:undefined,
-                    kjb:undefined,
-                    dxmb:undefined,
-                    gsqssj:undefined,
-                    gszzsj:undefined,
-                    xgxx:undefined,
-                    mdmc:undefined,
+                    mdbm: undefined,
+                    dm: undefined,
+                    djmd: undefined,
+                    isNewStore: undefined
 				},
                 list: [],
                 listLoading: true,
-                multipleSelection: [], total: 0,
+                total: 0,
                 listQuery: {
                     currentPage: 1,
                     pageSize: 20,
 					sort: "desc",
                     sidx: "",
                 },
-                formVisible: false,
-                exportBoxVisible: false,
+                dialogVisible: false,
+                saveLoading: false,
+                dialogTitle: '编辑门店归属',
+                editForm: {
+                    id: '',
+                    mdbm: '',
+                    dm: '',
+                    syb: '',
+                    jyb: '',
+                    kjb: '',
+                    dxmb: ''
+                },
+                editRules: {
+                    syb: [{ required: false, message: '请选择事业部', trigger: 'change' }],
+                    jyb: [{ required: false, message: '请选择教育部', trigger: 'change' }],
+                    kjb: [{ required: false, message: '请选择科技部', trigger: 'change' }],
+                    dxmb: [{ required: false, message: '请选择大项目部', trigger: 'change' }]
+                },
                 columnList: [
-                    { prop: 'id', label: '门店编码' },
-                    { prop: 'djmdbh', label: '单据门店编号' },
+                    { prop: 'mdbm', label: '门店编码' },
+                    { prop: 'dm', label: '门店名称' },
                     { prop: 'djmd', label: '单据门店' },
                     { prop: 'syb', label: '事业部' },
                     { prop: 'jyb', label: '教育部' },
                     { prop: 'kjb', label: '科技部' },
                     { prop: 'dxmb', label: '大项目部' },
-                    { prop: 'gsqssj', label: '归属起始时间' },
-                    { prop: 'gszzsj', label: '归属终止时间' },
-                    { prop: 'xgxx', label: '修改信息' },
-                    { prop: 'mdmc', label: '门店名称' },
+                    { prop: 'isNewStore', label: '是否新店' }
 				],
-				mdmcOptions : [],
-				sybOptions : [],
-				jybOptions : [],
-				kjbOptions : [],
-				dxmbOptions : [],
+				sybOptions: [],
+				jybOptions: [],
+				kjbOptions: [],
+				dxmbOptions: [],
 			}
         },
 		computed: {},
 		created() {
 			this.initData()
-			this.getmdmcOptions();
-			this.getsybOptions();
-			this.getjybOptions();
-			this.getkjbOptions();
-			this.getdxmbOptions();
+			this.loadDepartmentOptions()
 		},
 		methods: {
-			getmdmcOptions(){
-				previewDataInterface('730960205902251269').then(res => {
-					this.mdmcOptions = res.data
-				});
+			// 加载部门选项
+			loadDepartmentOptions() {
+				// 加载事业部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '事业部' }
+				}).then(res => {
+					this.sybOptions = res.data || []
+				}).catch(() => {
+					this.sybOptions = []
+				})
+
+				// 加载教育部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '教育部' }
+				}).then(res => {
+					this.jybOptions = res.data || []
+				}).catch(() => {
+					this.jybOptions = []
+				})
+
+				// 加载科技部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '科技部' }
+				}).then(res => {
+					this.kjbOptions = res.data || []
+				}).catch(() => {
+					this.kjbOptions = []
+				})
+
+				// 加载大项目部
+				request({
+					url: '/api/Extend/Organize/GetByName',
+					method: 'GET',
+					data: { organizeName: '大项目部' }
+				}).then(res => {
+					this.dxmbOptions = res.data || []
+				}).catch(() => {
+					this.dxmbOptions = []
+				})
+			},
+
+			// 获取部门名称
+			getDepartmentName(id, options) {
+				const option = options.find(item => item.Id === id)
+				return option ? option.FullName : '未知'
 			},
-			getsybOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.sybOptions = res.data
-				});
+
+			// 加载所有门店的新店保护状态
+			async loadNewStoreStatus() {
+				if (!this.list || this.list.length === 0) return
+				
+				// 并行查询所有门店的保护状态
+				const promises = this.list.map(async (row) => {
+					if (!row.id) {
+						this.$set(row, 'isNewStore', false)
+						return
+					}
+					
+					try {
+						const res = await request({
+							url: `/api/Extend/LqMdXdbhsj/GetByStoreId/${row.id}`,
+							method: 'GET'
+						})
+						
+						this.$set(row, 'isNewStore', res.data && res.data.hasProtection === true)
+						
+					} catch (error) {
+						console.error(`查询门店 ${row.dm} 保护时间失败:`, error)
+						this.$set(row, 'isNewStore', false)
+					}
+				})
+				
+				await Promise.all(promises)
 			},
-			getjybOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.jybOptions = res.data
-				});
+
+			// 判断是否为新店（通过门店新店保护时间表查询）
+			async isNewStore(row) {
+				if (!row.id) return false
+				
+				try {
+					const res = await request({
+						url: `/api/Extend/LqMdXdbhsj/GetByStoreId/${row.id}`,
+						method: 'GET'
+					})
+					
+					const isNew = res.data && res.data.hasProtection === true
+					this.$set(row, 'isNewStore', isNew)
+					return isNew
+				} catch (error) {
+					console.error(`查询门店 ${row.dm} 保护时间失败:`, error)
+					this.$set(row, 'isNewStore', false)
+					return false
+				}
 			},
-			getkjbOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.kjbOptions = res.data
-				});
+
+			// 编辑处理
+			editHandle(row) {
+				this.dialogTitle = '编辑门店归属'
+				this.editForm = {
+					id: row.id,
+					mdbm: row.mdbm,
+					dm: row.dm,
+					syb: row.syb || '',
+					jyb: row.jyb || '',
+					kjb: row.kjb || '',
+					dxmb: row.dxmb || ''
+				}
+				this.dialogVisible = true
 			},
-			getdxmbOptions(){
-				previewDataInterface('731056988015822085').then(res => {
-					this.dxmbOptions = res.data
-				});
+
+			// 查看处理
+			viewHandle(row) {
+				this.dialogTitle = '查看门店归属'
+				this.editForm = {
+					id: row.id,
+					mdbm: row.mdbm,
+					dm: row.dm,
+					syb: row.syb || '',
+					jyb: row.jyb || '',
+					kjb: row.kjb || '',
+					dxmb: row.dxmb || ''
+				}
+				this.dialogVisible = true
 			},
-			initData() {
+
+
+			// 弹窗关闭处理
+			handleClose() {
+				if (this.saveLoading) {
+					this.$message.warning('正在保存中，请稍候...')
+					return
+				}
+				this.dialogVisible = false
+				this.$refs.editForm && this.$refs.editForm.resetFields()
+			},
+
+			// 保存编辑
+			saveEdit() {
+				this.$refs.editForm.validate((valid) => {
+					if (valid) {
+						this.saveLoading = true
+						request({
+							url: `/api/Extend/LqMdxx/${this.editForm.id}`,
+							method: 'PUT',
+							data: {
+								syb: this.editForm.syb,
+								jyb: this.editForm.jyb,
+								kjb: this.editForm.kjb,
+								dxmb: this.editForm.dxmb
+							}
+						}).then(res => {
+							this.$message.success('保存成功')
+							this.dialogVisible = false
+							this.initData()
+						}).catch(() => {
+							this.$message.error('保存失败')
+						}).finally(() => {
+							this.saveLoading = false
+						})
+					}
+				})
+			},
+
+
+			async initData() {
                 this.listLoading = true;
                 let _query = {
                     ...this.listQuery,
@@ -236,92 +516,27 @@
                         query[key] = _query[key]
                     }
                 }
-                request({
-                    url: `/api/Extend/LqMdMdgs`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
+                
+                try {
+                    const res = await request({
+                        url: `/api/Extend/LqMdxx`,
+                        method: 'GET',
+                        data: query
+                    })
+                    
                     this.list = res.data.list
                     this.total = res.data.pagination.total
+                    
+                    // 为每个门店查询新店保护状态
+                    await this.loadNewStoreStatus()
+                    
+                } catch (error) {
+                    console.error('加载门店数据失败:', error)
+                } finally {
                     this.listLoading = false
-                })
-            },
-			handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqMdMdgs/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-			handleSelectionChange(val) {
-                const res = val.map(item => item.id)
-                this.multipleSelection = res
-            },
-            handleBatchRemoveDel() {
-                if (!this.multipleSelection.length) {
-                    this.$message({
-                        type: 'error',
-                        message: '请选择一条数据',
-                        duration: 1500,
-                    })
-                    return
                 }
-                const ids = this.multipleSelection
-                this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/Extend/LqMdMdgs/batchRemove`,
-                        method: 'POST',
-                        data: ids ,
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => { })
-            },
-			addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.NCCForm.init(id, isDetail)
-                })
-            },
-			exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = { ...data, ...this.listQuery, ...this.query }
-                request({
-                    url: `/api/Extend/LqMdMdgs/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    window.location.href = this.define.comUrl + res.data.url
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
             },
+
 			search() {
                 this.listQuery = {
                     currentPage: 1,
@@ -331,10 +546,6 @@
                 }
                 this.initData()
             },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
             reset() {
                 for (let key in this.query) {
                     this.query[key] = undefined
@@ -348,5 +559,124 @@
                 this.initData()
             }
 		}
-    }
-</script>
\ No newline at end of file
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 页面头部样式
+	.NCC-common-head-left {
+		display: flex;
+		align-items: center;
+		gap: 12px;
+	}
+
+	.NCC-common-head-title {
+		margin: 0;
+		font-size: 18px;
+		font-weight: 600;
+		color: #303133;
+		display: flex;
+		align-items: center;
+		gap: 8px;
+
+		i {
+			color: #409EFF;
+			font-size: 20px;
+		}
+	}
+
+
+	// 表格样式
+	.store-name {
+		font-weight: 500;
+		color: #303133;
+	}
+
+	.empty-text {
+		color: #C0C4CC;
+		font-style: italic;
+	}
+
+	.action-btn {
+		padding: 4px 8px;
+		margin: 0 2px;
+		
+		&:hover {
+			background-color: #f5f7fa;
+		}
+	}
+
+	// 弹窗样式
+	.store-dialog {
+		.dialog-header {
+			padding: 16px 0;
+			border-bottom: 1px solid #EBEEF5;
+			margin-bottom: 20px;
+
+			.store-info {
+				display: flex;
+				align-items: center;
+				gap: 12px;
+
+				i {
+					font-size: 20px;
+					color: #409EFF;
+				}
+
+				.store-name {
+					font-size: 16px;
+					font-weight: 600;
+					color: #303133;
+				}
+			}
+		}
+
+		.edit-form {
+			.el-form-item {
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+
+	// 搜索区域样式
+	.search-buttons {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+	}
+
+	// 响应式设计
+	@media (max-width: 768px) {
+		.NCC-common-head {
+			flex-direction: column;
+			align-items: flex-start;
+			gap: 12px;
+
+			.NCC-common-head-right {
+				width: 100%;
+				justify-content: flex-start;
+			}
+		}
+
+		.el-col {
+			margin-bottom: 16px;
+		}
+
+		.store-dialog {
+			.el-dialog {
+				width: 95% !important;
+				margin: 0 auto;
+			}
+		}
+	}
+
+	// 表格响应式
+	@media (max-width: 1200px) {
+		.NCC-table {
+			.el-table {
+				font-size: 12px;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue b/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue
index 90cce88..8ab1f9d 100644
--- a/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/Form.vue
@@ -1,205 +1,161 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="600px">
-		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="主键" prop="id">
-							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="月份" prop="yf">
-							<el-input v-model="dataForm.yf" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="门店" prop="md">
-							<el-input v-model="dataForm.md" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="金三角" prop="jsj">
-							<el-input v-model="dataForm.jsj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="岗位" prop="gw">
-							<el-input v-model="dataForm.gw" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="健康师" prop="jks">
-							<el-input v-model="dataForm.jks" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="成交率" prop="cjl">
-							<el-input v-model="dataForm.cjl" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="成交业绩" prop="cjyj">
-							<el-input v-model="dataForm.cjyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="成交提点" prop="cjtd">
-							<el-input v-model="dataForm.cjtd" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="剩余业绩" prop="syyj">
-							<el-input v-model="dataForm.syyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="出勤天数" prop="cqts">
-							<el-input v-model="dataForm.cqts" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="系统业绩" prop="xtyj">
-							<el-input v-model="dataForm.xtyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="总业绩" prop="zyj">
-							<el-input v-model="dataForm.zyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="基础业绩" prop="jcyj">
-							<el-input v-model="dataForm.jcyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合作业绩" prop="hzyj">
-							<el-input v-model="dataForm.hzyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="奖励业绩" prop="jlyj">
-							<el-input v-model="dataForm.jlyj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="项目数" prop="xms">
-							<el-input v-model="dataForm.xms" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="手工" prop="sg">
-							<el-input v-model="dataForm.sg" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="是否属于战队" prop="sfsyzd">
-							<el-input v-model="dataForm.sfsyzd" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="是否满足考勤" prop="fsmzkq">
-							<el-input v-model="dataForm.fsmzkq" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="战队最终人数" prop="zdzzrs">
-							<el-input v-model="dataForm.zdzzrs" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="视为单人" prop="kqhbsyzd">
-							<el-input v-model="dataForm.kqhbsyzd" placeholder="考勤后不属于战队的" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="战队提成" prop="zdtc">
-							<el-input v-model="dataForm.zdtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="按1人提成" prop="ayrtc">
-							<el-input v-model="dataForm.ayrtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="最终提成点" prop="zztcd">
-							<el-input v-model="dataForm.zztcd" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="基础业绩提成" prop="jcyjtc">
-							<el-input v-model="dataForm.jcyjtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="合作业绩提成" prop="hzyjtc">
-							<el-input v-model="dataForm.hzyjtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="提成合计" prop="tchj">
-							<el-input v-model="dataForm.tchj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="个人占比" prop="grzb">
-							<el-input v-model="dataForm.grzb" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="组员合计" prop="zyhj">
-							<el-input v-model="dataForm.zyhj" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="顾问提成" prop="gwtc">
-							<el-input v-model="dataForm.gwtc" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-form>
-		</el-row>
+	<el-dialog 
+		:title="dialogTitle" 
+		:close-on-click-modal="false" 
+		:visible.sync="visible" 
+		class="NCC-dialog NCC-dialog_center" 
+		lock-scroll 
+		width="900px"
+		:before-close="handleClose">
+		
+		<!-- 基本信息 -->
+		<el-form ref="basicForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+			<el-row :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="月份" prop="yf">
+						<el-date-picker
+							v-model="monthValue"
+							type="month"
+							placeholder="请选择月份"
+							format="yyyyMM"
+							value-format="yyyyMM"
+							:style='{"width":"100%"}'
+							@change="onMonthChange">
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="门店" prop="md">
+						<el-select 
+							v-model="dataForm.md" 
+							placeholder="请选择门店" 
+							clearable 
+							:style='{"width":"100%"}' 
+							@change="onStoreChange"
+							filterable>
+							<el-option
+								v-for="store in storeList"
+								:key="store.id"
+								:label="store.name"
+								:value="store.id">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="金三角" prop="jsj">
+						<el-input 
+							v-model="dataForm.jsj" 
+							placeholder="请输入金三角名称" 
+							clearable 
+							:style='{"width":"100%"}' 
+							maxlength="50">
+						</el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		
+		<!-- 成员管理 -->
+		<div class="member-section">
+			<div class="section-title">
+				<span>{{ isDetail ? '成员信息' : '成员管理' }}</span>
+				<div class="member-actions" v-if="!isDetail">
+					<el-button type="primary" icon="el-icon-plus" @click="addMember" size="small">添加成员</el-button>
+					<el-button type="warning" icon="el-icon-refresh" @click="refreshMembers" size="small">刷新</el-button>
+					<span class="member-count">共 {{ members.length }} 人</span>
+				</div>
+				<span class="member-count" v-if="isDetail">共 {{ members.length }} 人</span>
+			</div>
+			
+			<el-table :data="members" border style="width: 100%; margin-top: 10px;" :header-cell-style="{ background: '#f5f7fa', color: '#606266', fontWeight: 'bold' }">
+				<el-table-column type="index" label="序号" min-width="80" align="center" />
+				<el-table-column prop="userName" label="姓名" min-width="120">
+					<template slot-scope="scope">
+						<el-input v-if="!isDetail" v-model="scope.row.userName" size="small" placeholder="请输入姓名" />
+						<div v-else class="member-name">
+							<i class="el-icon-user"></i>
+							<span>{{ scope.row.userName }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户" min-width="180">
+					<template slot-scope="scope">
+						<el-select 
+							v-if="!isDetail"
+							v-model="scope.row.userId" 
+							placeholder="选择用户" 
+							size="small" 
+							@change="onUserChange(scope.$index, $event)"
+							filterable
+							style="width: 100%;">
+							<el-option
+								v-for="user in availableUsers"
+								:key="user.id"
+								:label="user.name"
+								:value="user.id">
+							</el-option>
+						</el-select>
+						<div v-else class="user-info">
+							<i class="el-icon-user-solid"></i>
+							<span>{{ scope.row.userId }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="是否顾问" min-width="120" align="center">
+					<template slot-scope="scope">
+						<el-radio-group v-if="!isDetail" v-model="scope.row.isLeader" size="small">
+							<el-radio :label="1">是</el-radio>
+							<el-radio :label="0">否</el-radio>
+						</el-radio-group>
+						<el-tag v-else :type="scope.row.isLeader === 1 ? 'success' : 'info'" size="small" effect="dark">
+							<i class="el-icon-star-on" v-if="scope.row.isLeader === 1"></i>
+							<i class="el-icon-star-off" v-else></i>
+							{{ scope.row.isLeader === 1 ? '是' : '否' }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column label="排序" min-width="100" align="center">
+					<template slot-scope="scope">
+						<el-input-number 
+							v-if="!isDetail"
+							v-model="scope.row.sortOrder" 
+							:min="1" 
+							:max="999" 
+							size="small"
+							style="width: 100%;" />
+						<el-tag v-else type="info" size="small">{{ scope.row.sortOrder }}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="状态" min-width="100" align="center" v-if="isDetail">
+					<template slot-scope="scope">
+						<el-tag :type="scope.row.status === 'ACTIVE' ? 'success' : 'info'" size="small" effect="dark">
+							<i class="el-icon-check" v-if="scope.row.status === 'ACTIVE'"></i>
+							<i class="el-icon-close" v-else></i>
+							{{ scope.row.status === 'ACTIVE' ? '活跃' : '非活跃' }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" min-width="120" align="center" v-if="!isDetail">
+					<template slot-scope="scope">
+						<el-button type="danger" icon="el-icon-delete" @click="removeMember(scope.$index)" size="small" plain>删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		
 		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</el-button>
+			<el-button @click="handleClose">取 消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
 		</span>
 	</el-dialog>
 </template>
+
 <script>
 	import request from '@/utils/request'
 	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	
 	export default {
 		components: {},
 		props: [],
@@ -208,109 +164,430 @@
 				loading: false,
 				visible: false,
 				isDetail: false,
+				isManageMembers: false,
 				dataForm: {
-					id:'',
-					id:undefined,
-					yf:undefined,
-					md:undefined,
-					jsj:undefined,
-					gw:undefined,
-					jks:undefined,
-					cjl:undefined,
-					cjyj:undefined,
-					cjtd:undefined,
-					syyj:undefined,
-					cqts:undefined,
-					xtyj:undefined,
-					zyj:undefined,
-					jcyj:undefined,
-					hzyj:undefined,
-					jlyj:undefined,
-					xms:undefined,
-					sg:undefined,
-					sfsyzd:undefined,
-					fsmzkq:undefined,
-					zdzzrs:undefined,
-					kqhbsyzd:undefined,
-					zdtc:undefined,
-					ayrtc:undefined,
-					zztcd:undefined,
-					jcyjtc:undefined,
-					hzyjtc:undefined,
-					tchj:undefined,
-					grzb:undefined,
-					zyhj:undefined,
-					gwtc:undefined,
+					id: '',
+					yf: '',
+					md: '',
+					jsj: ''
 				},
+				members: [],
+				storeList: [],
+				availableUsers: [],
+				monthValue: null, // 月份选择器的值
 				rules: {
-				},
+					yf: [
+						{ required: true, message: '月份不能为空', trigger: 'blur' },
+						{ pattern: /^\d{6}$/, message: '月份格式必须为yyyyMM', trigger: 'blur' }
+					],
+					md: [
+						{ required: true, message: '门店不能为空', trigger: 'change' }
+					],
+					jsj: [
+						{ required: true, message: '金三角名称不能为空', trigger: 'blur' }
+					]
+				}
 			}
 		},
-		computed: {},
-        watch: {},
-        created() {
+		computed: {
+			dialogTitle() {
+				if (this.isDetail) return '金三角详情'
+				if (this.isManageMembers) return '管理成员'
+				return this.dataForm.id ? '编辑金三角' : '新建金三角'
+			}
 		},
-		mounted() {
-        },
+		watch: {},
+		created() {},
+		mounted() {},
 		methods: {
 			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+				this.$emit('refresh')
+			},
+			init(id, isDetail, isManageMembers) {
+				this.dataForm.id = id || 0
+				this.visible = true
+				this.isDetail = isDetail || false
+				this.isManageMembers = isManageMembers || false
+				this.members = []
+				
 				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
+					this.$refs['basicForm'] && this.$refs['basicForm'].resetFields()
+					this.loadStoreList()
 					if (this.dataForm.id) {
-						request({
-							url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-						})
+						this.loadData()
+					}
+				})
+			},
+			loadData() {
+				// 加载基本信息
+				request({
+					url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
+					method: 'get'
+				}).then(res => {
+					this.dataForm = res.data
+					// 同步月份选择器的值
+					this.monthValue = this.dataForm.yf
+					// 门店变化后更新可用用户（不清空成员）
+					if (this.dataForm.md) {
+						this.loadUsersByStore(this.dataForm.md)
+					}
+				})
+				
+				// 加载成员信息
+				request({
+					url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id + '/detail',
+					method: 'get'
+				}).then(res => {
+					this.members = res.data.members || []
+				})
+			},
+			loadStoreList() {
+				// 加载门店列表
+				request({
+					url: '/api/Extend/LqMdxx/Selector',
+					method: 'GET'
+				}).then(res => {
+					this.storeList = res.data.list.map(item => ({
+						id: item.id,
+						name: item.fullName
+					}))
+				}).catch(() => {
+					this.storeList = []
+				})
+			},
+			onStoreChange() {
+				// 门店变化时更新可用用户
+				if (this.dataForm.md) {
+					this.loadUsersByStore(this.dataForm.md)
+				} else {
+					this.availableUsers = []
+				}
+				// 清空已选择的成员
+				this.members = []
+			},
+			loadUsersByStore(storeId) {
+				// 根据门店ID加载用户
+				request({
+					url: '/api/Extend/User/Selector',
+					method: 'GET',
+					params: {
+						mdid: storeId
 					}
+				}).then(res => {
+					this.availableUsers = res.data.map(item => ({
+						id: item.id,
+						name: item.realName,
+						storeId: item.mdid
+					}))
+				}).catch(() => {
+					this.availableUsers = []
 				})
 			},
+			onUserChange(index, userId) {
+				// 用户选择变化时自动填充姓名
+				const selectedUser = this.availableUsers.find(user => user.id === userId)
+				if (selectedUser) {
+					this.$set(this.members[index], 'userName', selectedUser.name)
+				}
+			},
+			onMonthChange(value) {
+				// 月份选择器变化时更新dataForm.yf
+				this.dataForm.yf = value
+			},
 			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/LqYcsdJsj`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
+				this.$refs['basicForm'].validate((valid) => {
+					if (valid) {
+						// 验证多人战队必须有顾问
+						if (this.members.length >= 2) {
+							const hasLeader = this.members.some(m => m.isLeader === 1)
+							if (!hasLeader) {
+								this.$message.error('两人或两人以上的战队必须有一个顾问')
+								this.activeTab = 'members'
+								return
+							}
+						}
+						
+						const submitData = {
+							...this.dataForm,
+							members: this.members
+						}
+						
+						if (!this.dataForm.id) {
+							// 新建
+							request({
+								url: `/api/Extend/LqYcsdJsj`,
+								method: 'post',
+								data: submitData,
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						} else {
+							// 编辑
+							request({
+								url: '/api/Extend/LqYcsdJsj/' + this.dataForm.id,
+								method: 'PUT',
+								data: submitData
+							}).then((res) => {
+								this.$message({
+									message: res.msg,
+									type: 'success',
+									duration: 1000,
+									onClose: () => {
+										this.visible = false
+										this.$emit('refresh', true)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
+			// 成员管理方法
+			addMember() {
+				if (!this.dataForm.md) {
+					this.$message.warning('请先选择门店')
+					return
+				}
+				this.members.push({
+					userId: '',
+					userName: '',
+					isLeader: 0,
+					sortOrder: this.members.length + 1
+				})
+			},
+			removeMember(index) {
+				this.$confirm('确定要删除这个成员吗？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					this.members.splice(index, 1)
+					// 重新排序
+					this.members.forEach((member, index) => {
+						member.sortOrder = index + 1
+					})
+				})
 			},
+			refreshMembers() {
+				if (this.dataForm.id) {
+					this.loadData()
+				}
+			},
+			handleClose() {
+				this.visible = false
+			}
 		}
 	}
 </script>
+
+<style scoped>
+/* 基本信息区域 */
+.el-form {
+	background: #f8f9fa;
+	padding: 20px;
+	border-radius: 8px;
+	margin-bottom: 20px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+	border: 1px solid #e9ecef;
+}
+
+.el-form-item__label {
+	font-weight: 600;
+	color: #2c3e50;
+}
+
+/* 成员管理区域 */
+.member-section {
+	margin-top: 20px;
+	padding: 20px;
+	border: 1px solid #e1e8ed;
+	border-radius: 8px;
+	background: #fff;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.section-title {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 16px;
+	font-size: 18px;
+	font-weight: 700;
+	color: #2c3e50;
+	border-bottom: 2px solid #3498db;
+	padding-bottom: 8px;
+}
+
+.member-actions {
+	display: flex;
+	align-items: center;
+	gap: 12px;
+}
+
+.member-count {
+	color: #7f8c8d;
+	font-size: 14px;
+	font-weight: 500;
+	background: #ecf0f1;
+	padding: 4px 12px;
+	border-radius: 20px;
+}
+
+/* 表格样式 */
+.el-table {
+	margin-top: 16px;
+	border-radius: 8px;
+	overflow: hidden;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.el-table th {
+	background: #409EFF !important;
+	color: #fff !important;
+	font-weight: 600;
+}
+
+.el-table tbody tr:hover > td {
+	background-color: #f8f9fa !important;
+}
+
+/* 成员信息显示 */
+.member-name, .user-info {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: #2c3e50;
+	font-weight: 500;
+}
+
+.member-name i, .user-info i {
+	color: #3498db;
+	font-size: 16px;
+}
+
+/* 标签样式 */
+.el-tag {
+	border-radius: 16px;
+	font-weight: 500;
+	padding: 4px 12px;
+}
+
+.el-tag i {
+	margin-right: 4px;
+}
+
+/* 按钮样式 */
+.el-button {
+	border-radius: 6px;
+	font-weight: 500;
+	transition: all 0.3s ease;
+}
+
+.el-button:hover {
+	transform: translateY(-1px);
+	box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+/* 输入框样式 */
+.el-input, .el-select, .el-input-number {
+	border-radius: 6px;
+}
+
+.el-input__inner, .el-textarea__inner {
+	border-radius: 6px;
+	transition: all 0.3s ease;
+}
+
+.el-input__inner:focus, .el-textarea__inner:focus {
+	border-color: #3498db;
+	box-shadow: 0 0 0 2px rgba(52, 152, 219, 0.2);
+}
+
+/* 对话框样式 */
+.NCC-dialog {
+	border-radius: 8px;
+	overflow: hidden;
+}
+
+.el-dialog__header {
+	background: #409EFF;
+	color: #fff;
+	padding: 20px;
+}
+
+.el-dialog__title {
+	font-weight: 600;
+	font-size: 18px;
+}
+
+.el-dialog__body {
+	padding: 30px;
+	background: #f8f9fa;
+}
+
+.el-dialog__footer {
+	background: #fff;
+	padding: 20px 30px;
+	border-top: 1px solid #e9ecef;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+	.member-actions {
+		flex-direction: column;
+		align-items: flex-start;
+		gap: 8px;
+	}
+	
+	.action-buttons {
+		flex-direction: column;
+		width: 100%;
+	}
+	
+	.action-buttons .el-button {
+		width: 100%;
+	}
+}
+
+/* 动画效果 */
+.member-section {
+	animation: fadeInUp 0.5s ease-out;
+}
+
+@keyframes fadeInUp {
+	from {
+		opacity: 0;
+		transform: translateY(20px);
+	}
+	to {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
+
+/* 滚动条样式 */
+.el-table__body-wrapper::-webkit-scrollbar {
+	width: 6px;
+	height: 6px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-track {
+	background: #f1f1f1;
+	border-radius: 3px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb {
+	background: #c1c1c1;
+	border-radius: 3px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
+	background: #a8a8a8;
+}
+</style>
\ No newline at end of file
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue b/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue
new file mode 100644
index 0000000..cf858e5
--- /dev/null
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/MemberDialog.vue
@@ -0,0 +1,197 @@
+<template>
+	<el-dialog 
+		title="成员管理" 
+		:visible.sync="visible" 
+		width="900px" 
+		:close-on-click-modal="false"
+		@close="handleClose">
+		
+		<div class="member-dialog">
+			<!-- 操作栏 -->
+			<div class="member-toolbar">
+				<el-button type="primary" icon="el-icon-plus" @click="addMember" size="small">添加成员</el-button>
+				<el-button type="warning" icon="el-icon-refresh" @click="refreshMembers" size="small">刷新</el-button>
+				<el-button type="success" icon="el-icon-check" @click="saveAll" size="small">保存全部</el-button>
+				<span class="member-count">共 {{ members.length }} 人</span>
+			</div>
+			
+			<!-- 成员列表 -->
+			<el-table :data="members" border style="width: 100%; margin-top: 10px;" v-loading="loading">
+				<el-table-column type="index" label="序号" width="60" align="center" />
+				<el-table-column prop="userName" label="姓名" width="120">
+					<template slot-scope="scope">
+						<el-input v-model="scope.row.userName" size="mini" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户ID" width="150">
+					<template slot-scope="scope">
+						<el-input v-model="scope.row.userId" size="mini" />
+					</template>
+				</el-table-column>
+				<el-table-column label="是否顾问" width="120" align="center">
+					<template slot-scope="scope">
+						<el-radio-group v-model="scope.row.isLeader" size="mini">
+							<el-radio :label="1">是</el-radio>
+							<el-radio :label="0">否</el-radio>
+						</el-radio-group>
+					</template>
+				</el-table-column>
+				<el-table-column label="排序" width="100" align="center">
+					<template slot-scope="scope">
+						<el-input-number 
+							v-model="scope.row.sortOrder" 
+							:min="1" 
+							:max="999" 
+							size="mini"
+							style="width: 80px;" />
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="100" align="center">
+					<template slot-scope="scope">
+						<el-button type="text" @click="removeMember(scope.$index)" class="NCC-table-delBtn" size="mini">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			
+			<!-- 批量操作 -->
+			<div class="batch-operations" v-if="members.length > 0">
+				<el-button type="info" @click="sortMembers" size="small">重新排序</el-button>
+				<el-button type="warning" @click="clearAll" size="small">清空全部</el-button>
+			</div>
+		</div>
+		
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="handleClose">取 消</el-button>
+			<el-button type="primary" @click="saveAll">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+
+<script>
+	import request from '@/utils/request'
+	
+	export default {
+		name: 'MemberDialog',
+		props: {
+			jsjId: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				visible: false,
+				loading: false,
+				members: []
+			}
+		},
+		methods: {
+			init(jsjId) {
+				this.jsjId = jsjId
+				this.visible = true
+				this.loadMembers()
+			},
+			loadMembers() {
+				if (!this.jsjId) return
+				
+				this.loading = true
+				request({
+					url: `/api/Extend/LqYcsdJsj/${this.jsjId}/detail`,
+					method: 'GET'
+				}).then(res => {
+					this.members = res.data.members || []
+					this.loading = false
+				}).catch(() => {
+					this.members = []
+					this.loading = false
+				})
+			},
+			addMember() {
+				this.members.push({
+					userId: '',
+					userName: '',
+					isLeader: 0,
+					sortOrder: this.members.length + 1
+				})
+			},
+			removeMember(index) {
+				this.$confirm('确定要删除这个成员吗？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					this.members.splice(index, 1)
+					this.sortMembers()
+				})
+			},
+			sortMembers() {
+				this.members.forEach((member, index) => {
+					member.sortOrder = index + 1
+				})
+			},
+			clearAll() {
+				this.$confirm('确定要清空所有成员吗？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					this.members = []
+				})
+			},
+			refreshMembers() {
+				this.loadMembers()
+			},
+			saveAll() {
+				// 验证数据
+				for (let i = 0; i < this.members.length; i++) {
+					const member = this.members[i]
+					if (!member.userId || !member.userName) {
+						this.$message.error(`第${i + 1}行成员信息不完整`)
+						return
+					}
+				}
+				
+				// 验证多人战队必须有顾问
+				if (this.members.length >= 2) {
+					const hasLeader = this.members.some(m => m.isLeader === 1)
+					if (!hasLeader) {
+						this.$message.error('两人或两人以上的战队必须有一个顾问')
+						return
+					}
+				}
+				
+				// 发送保存请求
+				this.$emit('save', this.members)
+				this.handleClose()
+			},
+			handleClose() {
+				this.visible = false
+				this.$emit('close')
+			}
+		}
+	}
+</script>
+
+<style scoped>
+.member-dialog {
+	padding: 10px 0;
+}
+
+.member-toolbar {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+}
+
+.member-count {
+	color: #606266;
+	font-size: 14px;
+	margin-left: auto;
+}
+
+.batch-operations {
+	margin-top: 15px;
+	padding-top: 15px;
+	border-top: 1px solid #ebeef5;
+}
+
+.el-table {
+	margin-top: 10px;
+}
+</style>
diff --git a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
index 22afa1a..38b74dd 100644
--- a/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
+++ b/antis-ncc-admin/src/views/lqYcsdJsj/index.vue
@@ -4,168 +4,45 @@
 			<el-row class="NCC-common-search-box" :gutter="16">
 				<el-form @submit.native.prevent>
 					<el-col :span="6">
-						<el-form-item label="主键">
-							<el-input v-model="query.id" placeholder="主键" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
 						<el-form-item label="月份">
-							<el-input v-model="query.yf" placeholder="月份" clearable />	
+							<el-date-picker
+								v-model="monthQuery"
+								type="month"
+								placeholder="请选择月份"
+								format="yyyyMM"
+								value-format="yyyyMM"
+								@change="onMonthQueryChange"
+								clearable>
+							</el-date-picker>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="门店">
-							<el-input v-model="query.md" placeholder="门店" clearable />	
+							<el-select 
+								v-model="query.md" 
+								placeholder="请选择门店" 
+								clearable 
+								filterable>
+								<el-option
+									v-for="store in storeList"
+									:key="store.id"
+									:label="store.name"
+									:value="store.id">
+								</el-option>
+							</el-select>
 						</el-form-item>
 					</el-col>
-					<template v-if="showAll">
 					<el-col :span="6">
 						<el-form-item label="金三角">
-							<el-input v-model="query.jsj" placeholder="金三角" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="岗位">
-							<el-input v-model="query.gw" placeholder="岗位" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="健康师">
-							<el-input v-model="query.jks" placeholder="健康师" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="成交率">
-							<el-input v-model="query.cjl" placeholder="成交率" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="成交业绩">
-							<el-input v-model="query.cjyj" placeholder="成交业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="成交提点">
-							<el-input v-model="query.cjtd" placeholder="成交提点" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="剩余业绩">
-							<el-input v-model="query.syyj" placeholder="剩余业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="出勤天数">
-							<el-input v-model="query.cqts" placeholder="出勤天数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="系统业绩">
-							<el-input v-model="query.xtyj" placeholder="系统业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="总业绩">
-							<el-input v-model="query.zyj" placeholder="总业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="基础业绩">
-							<el-input v-model="query.jcyj" placeholder="基础业绩" clearable />	
+							<el-input v-model="query.jsj" placeholder="金三角名称" clearable />	
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="合作业绩">
-							<el-input v-model="query.hzyj" placeholder="合作业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="奖励业绩">
-							<el-input v-model="query.jlyj" placeholder="奖励业绩" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="项目数">
-							<el-input v-model="query.xms" placeholder="项目数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="手工">
-							<el-input v-model="query.sg" placeholder="手工" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="是否属于战队">
-							<el-input v-model="query.sfsyzd" placeholder="是否属于战队" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="是否满足考勤">
-							<el-input v-model="query.fsmzkq" placeholder="是否满足考勤" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="战队最终人数">
-							<el-input v-model="query.zdzzrs" placeholder="战队最终人数" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="视为单人">
-							<el-input v-model="query.kqhbsyzd" placeholder="视为单人" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="战队提成">
-							<el-input v-model="query.zdtc" placeholder="战队提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="按1人提成">
-							<el-input v-model="query.ayrtc" placeholder="按1人提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="最终提成点">
-							<el-input v-model="query.zztcd" placeholder="最终提成点" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="基础业绩提成">
-							<el-input v-model="query.jcyjtc" placeholder="基础业绩提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="合作业绩提成">
-							<el-input v-model="query.hzyjtc" placeholder="合作业绩提成" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="提成合计">
-							<el-input v-model="query.tchj" placeholder="提成合计" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="个人占比">
-							<el-input v-model="query.grzb" placeholder="个人占比" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="组员合计">
-							<el-input v-model="query.zyhj" placeholder="组员合计" clearable />	
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="顾问提成">
-							<el-input v-model="query.gwtc" placeholder="顾问提成" clearable />	
-						</el-form-item>
-					</el-col>
-					</template>
-					<el-col :span="6">
-						<el-form-item>
-							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-							<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">展开</el-button>
-							<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>收起</el-button>
+						<el-form-item label=" ">
+							<div class="search-buttons">
+								<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+								<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							</div>
 						</el-form-item>
 					</el-col>
 				</el-form>
@@ -185,41 +62,46 @@
 					</div>
 				</div>
                 <NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
-					<el-table-column prop="id" label="主键" align="left" />
-					<el-table-column prop="yf" label="月份" align="left" />
-					<el-table-column prop="md" label="门店" align="left" />
-					<el-table-column prop="jsj" label="金三角" align="left" />
-					<el-table-column prop="gw" label="岗位" align="left" />
-					<el-table-column prop="jks" label="健康师" align="left" />
-					<el-table-column prop="cjl" label="成交率" align="left" />
-					<el-table-column prop="cjyj" label="成交业绩" align="left" />
-					<el-table-column prop="cjtd" label="成交提点" align="left" />
-					<el-table-column prop="syyj" label="剩余业绩" align="left" />
-					<el-table-column prop="cqts" label="出勤天数" align="left" />
-					<el-table-column prop="xtyj" label="系统业绩" align="left" />
-					<el-table-column prop="zyj" label="总业绩" align="left" />
-					<el-table-column prop="jcyj" label="基础业绩" align="left" />
-					<el-table-column prop="hzyj" label="合作业绩" align="left" />
-					<el-table-column prop="jlyj" label="奖励业绩" align="left" />
-					<el-table-column prop="xms" label="项目数" align="left" />
-					<el-table-column prop="sg" label="手工" align="left" />
-					<el-table-column prop="sfsyzd" label="是否属于战队" align="left" />
-					<el-table-column prop="fsmzkq" label="是否满足考勤" align="left" />
-					<el-table-column prop="zdzzrs" label="战队最终人数" align="left" />
-					<el-table-column prop="kqhbsyzd" label="视为单人" align="left" />
-					<el-table-column prop="zdtc" label="战队提成" align="left" />
-					<el-table-column prop="ayrtc" label="按1人提成" align="left" />
-					<el-table-column prop="zztcd" label="最终提成点" align="left" />
-					<el-table-column prop="jcyjtc" label="基础业绩提成" align="left" />
-					<el-table-column prop="hzyjtc" label="合作业绩提成" align="left" />
-					<el-table-column prop="tchj" label="提成合计" align="left" />
-					<el-table-column prop="grzb" label="个人占比" align="left" />
-					<el-table-column prop="zyhj" label="组员合计" align="left" />
-					<el-table-column prop="gwtc" label="顾问提成" align="left" />
-					<el-table-column label="操作" fixed="right" width="100">
-							<template slot-scope="scope">
-							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
-							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+					<el-table-column prop="yf" label="月份" align="center" min-width="120">
+						<template slot-scope="scope">
+							<el-tag type="primary" size="small">{{ formatMonth(scope.row.yf) }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column prop="md" label="门店" align="left" min-width="150">
+						<template slot-scope="scope">
+							<div class="store-info">
+								<i class="el-icon-shop"></i>
+								<span>{{ getStoreName(scope.row.md) }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="jsj" label="金三角" align="left" min-width="180">
+						<template slot-scope="scope">
+							<div class="team-info">
+								<i class="el-icon-user-solid"></i>
+								<span>{{ scope.row.jsj }}</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="成员数量" align="center" min-width="120">
+						<template slot-scope="scope">
+							<el-tag v-if="scope.row.memberCount > 0" type="success" size="small" effect="dark">
+								<i class="el-icon-user"></i>
+								{{ scope.row.memberCount }}人
+							</el-tag>
+							<el-tag v-else type="info" size="small">
+								<i class="el-icon-user"></i>
+								0人
+							</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" min-width="200">
+						<template slot-scope="scope">
+							<div class="action-buttons">
+								<el-button type="primary" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)" size="mini" plain>编辑</el-button>
+								<el-button type="info" icon="el-icon-view" @click="viewDetail(scope.row.id)" size="mini" plain>详情</el-button>
+								<el-button type="danger" icon="el-icon-delete" @click="handleDel(scope.row.id)" size="mini" plain>删除</el-button>
+							</div>
 						</template>
 					</el-table-column>
 				</NCC-table>
@@ -230,6 +112,107 @@
 		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 	</div>
 </template>
+
+<style scoped>
+.store-info {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: #606266;
+}
+
+.store-info i {
+	color: #409EFF;
+	font-size: 16px;
+}
+
+.team-info {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	color: #303133;
+	font-weight: 500;
+}
+
+.team-info i {
+	color: #67C23A;
+	font-size: 16px;
+}
+
+.action-buttons {
+	display: flex;
+	gap: 8px;
+	flex-wrap: wrap;
+}
+
+.action-buttons .el-button {
+	margin: 0;
+}
+
+/* 表格行悬停效果 */
+.el-table tbody tr:hover > td {
+	background-color: #f5f7fa !important;
+}
+
+/* 标签样式优化 */
+.el-tag {
+	border-radius: 12px;
+	font-weight: 500;
+}
+
+.el-tag i {
+	margin-right: 4px;
+}
+
+/* 搜索框样式优化 */
+.NCC-common-search-box .el-input__inner {
+	border-radius: 6px;
+}
+
+.NCC-common-search-box .el-button {
+	border-radius: 6px;
+}
+
+.search-buttons {
+	display: flex;
+	gap: 8px;
+	align-items: center;
+	height: 32px;
+}
+
+/* 表格容器样式 */
+.NCC-common-layout-main {
+	background: #fff;
+	border-radius: 8px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+	overflow: hidden;
+}
+
+/* 头部操作区域 */
+.NCC-common-head {
+	background: #f8f9fa;
+	padding: 16px 20px;
+	border-bottom: 1px solid #dee2e6;
+}
+
+/* 按钮组样式 */
+.NCC-common-head .el-button {
+	border-radius: 6px;
+	font-weight: 500;
+	transition: all 0.3s ease;
+}
+
+.NCC-common-head .el-button:hover {
+	transform: translateY(-1px);
+	box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+/* 分页样式 */
+.pagination {
+	margin-top: 20px;
+	text-align: center;
+}
+</style>
 <script>
     import request from '@/utils/request'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
@@ -242,41 +225,17 @@
             return {
                 showAll: false,
 				query: {
-                    id:undefined,
                     yf:undefined,
                     md:undefined,
                     jsj:undefined,
-                    gw:undefined,
-                    jks:undefined,
-                    cjl:undefined,
-                    cjyj:undefined,
-                    cjtd:undefined,
-                    syyj:undefined,
-                    cqts:undefined,
-                    xtyj:undefined,
-                    zyj:undefined,
-                    jcyj:undefined,
-                    hzyj:undefined,
-                    jlyj:undefined,
-                    xms:undefined,
-                    sg:undefined,
-                    sfsyzd:undefined,
-                    fsmzkq:undefined,
-                    zdzzrs:undefined,
-                    kqhbsyzd:undefined,
-                    zdtc:undefined,
-                    ayrtc:undefined,
-                    zztcd:undefined,
-                    jcyjtc:undefined,
-                    hzyjtc:undefined,
-                    tchj:undefined,
-                    grzb:undefined,
-                    zyhj:undefined,
-                    gwtc:undefined,
 				},
+				monthQuery: null, // 月份选择器的值
+				storeList: [], // 门店列表
                 list: [],
                 listLoading: true,
-                multipleSelection: [], total: 0,
+                multipleSelection: [], 
+                total: 0,
+                storeMap: {}, // 门店ID到名称的映射
                 listQuery: {
                     currentPage: 1,
                     pageSize: 20,
@@ -290,38 +249,12 @@
                     { prop: 'yf', label: '月份' },
                     { prop: 'md', label: '门店' },
                     { prop: 'jsj', label: '金三角' },
-                    { prop: 'gw', label: '岗位' },
-                    { prop: 'jks', label: '健康师' },
-                    { prop: 'cjl', label: '成交率' },
-                    { prop: 'cjyj', label: '成交业绩' },
-                    { prop: 'cjtd', label: '成交提点' },
-                    { prop: 'syyj', label: '剩余业绩' },
-                    { prop: 'cqts', label: '出勤天数' },
-                    { prop: 'xtyj', label: '系统业绩' },
-                    { prop: 'zyj', label: '总业绩' },
-                    { prop: 'jcyj', label: '基础业绩' },
-                    { prop: 'hzyj', label: '合作业绩' },
-                    { prop: 'jlyj', label: '奖励业绩' },
-                    { prop: 'xms', label: '项目数' },
-                    { prop: 'sg', label: '手工' },
-                    { prop: 'sfsyzd', label: '是否属于战队' },
-                    { prop: 'fsmzkq', label: '是否满足考勤' },
-                    { prop: 'zdzzrs', label: '战队最终人数' },
-                    { prop: 'kqhbsyzd', label: '视为单人' },
-                    { prop: 'zdtc', label: '战队提成' },
-                    { prop: 'ayrtc', label: '按1人提成' },
-                    { prop: 'zztcd', label: '最终提成点' },
-                    { prop: 'jcyjtc', label: '基础业绩提成' },
-                    { prop: 'hzyjtc', label: '合作业绩提成' },
-                    { prop: 'tchj', label: '提成合计' },
-                    { prop: 'grzb', label: '个人占比' },
-                    { prop: 'zyhj', label: '组员合计' },
-                    { prop: 'gwtc', label: '顾问提成' },
 				],
 			}
         },
 		computed: {},
 		created() {
+			this.loadStoreList()
 			this.initData()
 		},
 		methods: {
@@ -347,6 +280,11 @@
                     this.list = res.data.list
                     this.total = res.data.pagination.total
                     this.listLoading = false
+                    
+                    // 加载门店映射
+                    this.loadStoreMap()
+                    // 为每个金三角加载成员数量
+                    this.loadMemberCounts()
                 })
             },
 			handleDel(id) {
@@ -368,6 +306,70 @@
                 }).catch(() => {
                 });
             },
+            viewDetail(id) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.NCCForm.init(id, true)
+                })
+            },
+            loadMemberCounts() {
+                // 批量加载成员数量
+                const promises = this.list.map(item => {
+                    return request({
+                        url: `/api/Extend/LqYcsdJsj/${item.id}/detail`,
+                        method: 'GET'
+                    }).then(res => {
+                        this.$set(item, 'memberCount', res.data.members ? res.data.members.length : 0)
+                    }).catch(() => {
+                        this.$set(item, 'memberCount', 0)
+                    })
+                })
+                
+                Promise.all(promises).then(() => {
+                    // 所有成员数量加载完成
+                })
+            },
+            loadStoreMap() {
+                // 加载门店映射
+                request({
+                    url: '/api/Extend/LqMdxx/Selector',
+                    method: 'GET'
+                }).then(res => {
+                    this.storeMap = {}
+                    res.data.list.forEach(store => {
+                        this.storeMap[store.id] = store.fullName
+                    })
+                }).catch(() => {
+                    this.storeMap = {}
+                })
+            },
+            getStoreName(storeId) {
+                return this.storeMap[storeId] || storeId || '未知门店'
+            },
+            formatMonth(monthStr) {
+                if (!monthStr || monthStr.length !== 6) return monthStr
+                const year = monthStr.substring(0, 4)
+                const month = monthStr.substring(4, 6)
+                return `${year}年${month}月`
+            },
+            onMonthQueryChange(value) {
+                // 月份选择器变化时更新query.yf
+                this.query.yf = value
+            },
+            loadStoreList() {
+                // 加载门店列表
+                request({
+                    url: '/api/Extend/LqMdxx/Selector',
+                    method: 'GET'
+                }).then(res => {
+                    this.storeList = res.data.list.map(item => ({
+                        id: item.id,
+                        name: item.fullName
+                    }))
+                }).catch(() => {
+                    this.storeList = []
+                })
+            },
 			handleSelectionChange(val) {
                 const res = val.map(item => item.id)
                 this.multipleSelection = res
@@ -442,6 +444,7 @@
                 for (let key in this.query) {
                     this.query[key] = undefined
                 }
+                this.monthQuery = null
                 this.listQuery = {
                     currentPage: 1,
                     pageSize: 20,
diff --git a/netcore/src/Modularity/Order/.DS_Store b/netcore/netcore/.DS_Store
index 3126f1d..879eac4 100644
--- a/netcore/src/Modularity/Order/.DS_Store
+++ b/netcore/netcore/.DS_Store
diff --git a/netcore/.DS_Store b/netcore/netcore/src/.DS_Store
index 649a36e..c66fa50 100644
--- a/netcore/.DS_Store
+++ b/netcore/netcore/src/.DS_Store
diff --git a/netcore/netcore/src/Modularity/.DS_Store b/netcore/netcore/src/Modularity/.DS_Store
new file mode 100644
index 0000000..3a7fe57
--- /dev/null
+++ b/netcore/netcore/src/Modularity/.DS_Store
diff --git a/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store b/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store
new file mode 100644
index 0000000..8c6542f
--- /dev/null
+++ b/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store
diff --git a/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/.DS_Store b/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/.DS_Store
new file mode 100644
index 0000000..d62fe8c
--- /dev/null
+++ b/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/.DS_Store
diff --git a/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/.DS_Store b/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/.DS_Store
new file mode 100644
index 0000000..e1f354a
--- /dev/null
+++ b/netcore/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/Dto/.DS_Store
diff --git a/netcore/smart.agriculture.platform.NET.sln b/netcore/smart.agriculture.platform.NET.sln
index 0b282b2..faeb3ed 100644
--- a/netcore/smart.agriculture.platform.NET.sln
+++ b/netcore/smart.agriculture.platform.NET.sln
@@ -111,14 +111,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alipay.AopSdk.AspnetCore", 
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alipay.AopSdk.Core", "src\Infrastructure\NCC.Pay\Alipay.AopSdk.Core\Alipay.AopSdk.Core.csproj", "{02564FAF-BFA6-48E3-B62F-BED6E0CD8B70}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "09-Order", "09-Order", "{71BB7B52-326C-4E81-80F4-A0568FF781A6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCC.Order", "src\Modularity\Order\NCC.Order\NCC.Order.csproj", "{631D8B3D-5815-487C-AE2C-88ACE67129C1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCC.Order.Entitys", "src\Modularity\Order\NCC.Order.Entitys\NCC.Order.Entitys.csproj", "{63A51937-AB99-4FD6-A03D-F831E2DA6E6C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCC.Order.Interfaces", "src\Modularity\Order\NCC.Order.Interfaces\NCC.Order.Interfaces.csproj", "{F3323EB1-D5EF-4454-8A64-3A789959C2D9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCC.Core.Pay.Security", "src\Infrastructure\NCC.Pay\NCC.Security\NCC.Core.Pay.Security.csproj", "{240E0E13-FAB1-471C-8A50-903976D9BD40}"
 EndProject
 Global
@@ -279,18 +271,6 @@ Global
 		{02564FAF-BFA6-48E3-B62F-BED6E0CD8B70}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02564FAF-BFA6-48E3-B62F-BED6E0CD8B70}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02564FAF-BFA6-48E3-B62F-BED6E0CD8B70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{631D8B3D-5815-487C-AE2C-88ACE67129C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{631D8B3D-5815-487C-AE2C-88ACE67129C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{631D8B3D-5815-487C-AE2C-88ACE67129C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{631D8B3D-5815-487C-AE2C-88ACE67129C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63A51937-AB99-4FD6-A03D-F831E2DA6E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63A51937-AB99-4FD6-A03D-F831E2DA6E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63A51937-AB99-4FD6-A03D-F831E2DA6E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63A51937-AB99-4FD6-A03D-F831E2DA6E6C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3323EB1-D5EF-4454-8A64-3A789959C2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3323EB1-D5EF-4454-8A64-3A789959C2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3323EB1-D5EF-4454-8A64-3A789959C2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3323EB1-D5EF-4454-8A64-3A789959C2D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{240E0E13-FAB1-471C-8A50-903976D9BD40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{240E0E13-FAB1-471C-8A50-903976D9BD40}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{240E0E13-FAB1-471C-8A50-903976D9BD40}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -351,10 +331,6 @@ Global
 		{8A09F335-0493-4FA9-A59E-8CA9E72EB1AD} = {BB9C0656-46CB-4E76-9829-46459CDE195A}
 		{27C679E3-46A2-4555-94D9-80532852863D} = {BB9C0656-46CB-4E76-9829-46459CDE195A}
 		{02564FAF-BFA6-48E3-B62F-BED6E0CD8B70} = {BB9C0656-46CB-4E76-9829-46459CDE195A}
-		{71BB7B52-326C-4E81-80F4-A0568FF781A6} = {DEE60693-575B-43FA-B7AB-60B6045B632C}
-		{631D8B3D-5815-487C-AE2C-88ACE67129C1} = {71BB7B52-326C-4E81-80F4-A0568FF781A6}
-		{63A51937-AB99-4FD6-A03D-F831E2DA6E6C} = {71BB7B52-326C-4E81-80F4-A0568FF781A6}
-		{F3323EB1-D5EF-4454-8A64-3A789959C2D9} = {71BB7B52-326C-4E81-80F4-A0568FF781A6}
 		{240E0E13-FAB1-471C-8A50-903976D9BD40} = {BB9C0656-46CB-4E76-9829-46459CDE195A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/netcore/src/.DS_Store b/netcore/src/.DS_Store
index beb399d..5cd36b6 100644
--- a/netcore/src/.DS_Store
+++ b/netcore/src/.DS_Store
diff --git a/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj b/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj
index 2ba1be7..a9b4698 100644
--- a/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj
+++ b/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj
@@ -9,7 +9,6 @@
     <ProjectReference Include="..\..\Modularity\Extend\NCC.Extend\NCC.Extend.csproj" />
     <ProjectReference Include="..\..\Modularity\Message\NCC.Message\NCC.Message.csproj" />
     <ProjectReference Include="..\..\Modularity\OAuth\NCC.OAuth\NCC.OAuth.csproj" />
-    <ProjectReference Include="..\..\Modularity\Order\NCC.Order\NCC.Order.csproj" />
     <ProjectReference Include="..\..\Modularity\System\NCC.System\NCC.System.csproj" />
     <ProjectReference Include="..\..\Modularity\TaskSchedule\NCC.TaskScheduler\NCC.TaskScheduler.csproj" />
     <ProjectReference Include="..\..\Modularity\VisualData\NCC.VisualData\NCC.VisualData.csproj" />
diff --git a/netcore/src/Modularity/.DS_Store b/netcore/src/Modularity/.DS_Store
index ad1e96e..2203b68 100644
--- a/netcore/src/Modularity/.DS_Store
+++ b/netcore/src/Modularity/.DS_Store
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store
index 2607ccf..38bc758 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/.DS_Store
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/.DS_Store b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/.DS_Store
new file mode 100644
index 0000000..58aebeb
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/.DS_Store
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs
index c392dc6..c392dc6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs
index a51e3ad..a51e3ad 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs
index 749d1c5..749d1c5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs
index a4caf80..a4caf80 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs
index ee730f3..ee730f3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqBmzb/LqBmzbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxCrInput.cs
index 2aded10..2aded10 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxInfoOutput.cs
index e265d79..e265d79 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxListOutput.cs
index fb9b293..fb9b293 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxListQueryInput.cs
index b03fb09..b03fb09 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxUpInput.cs
index a772db8..a772db8 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqCpxx/LqCpxxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzCrInput.cs
index def1173..def1173 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzInfoOutput.cs
index dbd661c..dbd661c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzListOutput.cs
index a0668b0..a0668b0 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzListQueryInput.cs
index 25b1424..25b1424 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzUpInput.cs
index c38a964..c38a964 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGzUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqGz/LqGzUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs
index 637c6e5..637c6e5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs
index 88d80b7..88d80b7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs
index d504a9d..d504a9d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs
index 0d21ea3..0d21ea3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs
index 124a8fa..124a8fa 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHyglUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHygl/LqHyglUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkCrInput.cs
index a635f93..a635f93 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs
index 001e883..001e883 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListOutput.cs
index 4facf53..4facf53 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs
index 175e412..175e412 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkUpInput.cs
index 5e32ce3..5e32ce3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytkUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxCrInput.cs
index 81caf0d..81caf0d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxInfoOutput.cs
index 29eecc1..29eecc1 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxUpInput.cs
index 11639bd..11639bd 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfCrInput.cs
index d288018..d288018 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfInfoOutput.cs
index 26e2cbe..26e2cbe 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfListOutput.cs
index a2135f2..a2135f2 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfListQueryInput.cs
index f725b52..f725b52 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfUpInput.cs
index a683ea4..a683ea4 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzfUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHzf/LqHzfUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdCrInput.cs
index f2123e9..f2123e9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdInfoOutput.cs
index 138675b..138675b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdListOutput.cs
index 27665df..27665df 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdListQueryInput.cs
index b1a2c5a..b1a2c5a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdUpInput.cs
index d085f8b..d085f8b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqdUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJdqd/LqJdqdUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs
new file mode 100644
index 0000000..7aaf4bb
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserCrInput.cs
@@ -0,0 +1,38 @@
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系创建输入参数
+    /// </summary>
+    public class LqJinsanjiaoUserCrInput
+    {
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs
new file mode 100644
index 0000000..958a571
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserInfoOutput.cs
@@ -0,0 +1,80 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系详情输出参数
+    /// </summary>
+    public class LqJinsanjiaoUserInfoOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 金三角名称
+        /// </summary>
+        public string jsjName { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 用户手机号
+        /// </summary>
+        public string mobilePhone { get; set; }
+        
+        /// <summary>
+        /// 用户职位
+        /// </summary>
+        public string position { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+        
+        /// <summary>
+        /// 创建人ID
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        public DateTime? lastModifyTime { get; set; }
+        
+        /// <summary>
+        /// 最后修改人ID
+        /// </summary>
+        public string lastModifyUserId { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs
new file mode 100644
index 0000000..faf066b
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListOutput.cs
@@ -0,0 +1,65 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系列表输出参数
+    /// </summary>
+    public class LqJinsanjiaoUserListOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 金三角名称
+        /// </summary>
+        public string jsjName { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 用户手机号
+        /// </summary>
+        public string mobilePhone { get; set; }
+        
+        /// <summary>
+        /// 用户职位
+        /// </summary>
+        public string position { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs
new file mode 100644
index 0000000..d7d07d8
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserListQueryInput.cs
@@ -0,0 +1,41 @@
+using NCC.Common.Entity;
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系列表查询输入参数
+    /// </summary>
+    public class LqJinsanjiaoUserListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int? isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs
new file mode 100644
index 0000000..c65fb35
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJinsanjiaoUser/LqJinsanjiaoUserUpInput.cs
@@ -0,0 +1,38 @@
+namespace NCC.Extend.Entitys.Dto.LqJinsanjiaoUser
+{
+    /// <summary>
+    /// 金三角用户绑定关系更新输入参数
+    /// </summary>
+    public class LqJinsanjiaoUserUpInput
+    {
+        /// <summary>
+        /// 金三角ID
+        /// </summary>
+        public string jsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbCrInput.cs
index 8c50e1f..8c50e1f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbInfoOutput.cs
index 486a5b3..486a5b3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbListOutput.cs
index 351be20..351be20 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbListQueryInput.cs
index 813146c..813146c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbUpInput.cs
index 445f5ba..445f5ba 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJlmxb/LqJlmxbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaCrInput.cs
index 72084a7..72084a7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaInfoOutput.cs
index fab4d5c..fab4d5c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaListOutput.cs
index 45e8cdb..45e8cdb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaListQueryInput.cs
index f1ef255..f1ef255 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaUpInput.cs
index 2875235..2875235 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfaUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqJsfa/LqJsfaUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs
index c7b6198..c7b6198 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjInfoOutput.cs
index cba09ac..cba09ac 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyjInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjUpInput.cs
index b730adc..b730adc 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyjUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdJksyj/LqKdJksyjUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs
index 2a97b21..2a97b21 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
index 03e1f34..03e1f34 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs
index ddb2d73..ddb2d73 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs
index 534f61e..534f61e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpInput.cs
index 92d931c..92d931c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyj/LqKdKjbsyjCrInput.cs
index 6492753..6492753 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyj/LqKdKjbsyjCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyj/LqKdKjbsyjInfoOutput.cs
index e6c650e..e6c650e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyjInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyj/LqKdKjbsyjInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyj/LqKdKjbsyjUpInput.cs
index d9bc5f9..d9bc5f9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyjUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKjbsyj/LqKdKjbsyjUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
index ac2b421..ac2b421 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs
index aaa894b..aaa894b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxUpInput.cs
index 1136979..1136979 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
index ade2334..ade2334 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
index 167adcb..167adcb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
index 055429f..055429f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
index 0abd43b..0abd43b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxUpInput.cs
index bfe1a5c..bfe1a5c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKhxx/LqKhxxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbCrInput.cs
index 1d88405..1d88405 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbInfoOutput.cs
index 9340f26..9340f26 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbListOutput.cs
index ce4b263..ce4b263 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbListQueryInput.cs
index 63e4614..63e4614 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbUpInput.cs
index 2e74b40..2e74b40 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKqhzb/LqKqhzbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjCrInput.cs
index 7477b04..7477b04 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjInfoOutput.cs
index 5b1c6e9..5b1c6e9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjListOutput.cs
index 1dcdf28..1dcdf28 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjListQueryInput.cs
index bbe48b4..bbe48b4 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjUpInput.cs
index 097d096..097d096 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssjUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqLssj/LqLssjUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtCrInput.cs
index 8a5091c..8a5091c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtInfoOutput.cs
index dd8376f..dd8376f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtListOutput.cs
index 29fb782..29fb782 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtListQueryInput.cs
index 74285f8..74285f8 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtUpInput.cs
index c75a3cb..c75a3cb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzhtUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdFzht/LqMdFzhtUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxCrInput.cs
index 5fc6533..5fc6533 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxInfoOutput.cs
index 020d746..020d746 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxListOutput.cs
index f472c40..f472c40 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxListQueryInput.cs
index 60b33e6..60b33e6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxUpInput.cs
index cbe5df9..cbe5df9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdlbjhsxx/LqMdMdlbjhsxxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyCrInput.cs
index 9200110..9200110 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyInfoOutput.cs
index e20a2a4..e20a2a4 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyListOutput.cs
index 0b97e4b..0b97e4b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyListQueryInput.cs
index 4e7efc2..4e7efc2 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyUpInput.cs
index 7044860..7044860 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwyUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdwy/LqMdMdwyUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfCrInput.cs
index 5daebeb..5daebeb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfInfoOutput.cs
index 05d0c2b..05d0c2b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfListOutput.cs
index fe509b5..fe509b5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfListQueryInput.cs
index bf45c9e..bf45c9e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfUpInput.cs
index 828c0dc..828c0dc 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgfUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdgf/LqMdgfUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
index 3cd1b17..5cbfb07 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
@@ -83,5 +83,40 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public string ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        public string jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        public string kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        public string dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        public DateTime? gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        public DateTime? gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
index 91755bb..b33da10 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
@@ -83,5 +83,40 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public string ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        public string jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        public string kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        public string dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        public DateTime? gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        public DateTime? gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
index cec8bb3..d747328 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
@@ -82,5 +82,40 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
         /// </summary>
         public string ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        public string jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        public string kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        public string dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        public DateTime? gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        public DateTime? gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListQueryInput.cs
index b5bbe2d..b5bbe2d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxUpInput.cs
index edbc2ad..edbc2ad 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlCrInput.cs
index f3a1b60..f3a1b60 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlInfoOutput.cs
index 536e661..536e661 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlListOutput.cs
index 65efc34..65efc34 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlListQueryInput.cs
index 261949a..261949a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlUpInput.cs
index 78c076f..78c076f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzlUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqRyzl/LqRyzlUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbCrInput.cs
index 4a14314..4a14314 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbInfoOutput.cs
index d0e4e83..d0e4e83 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbListOutput.cs
index 81b4846..81b4846 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbListQueryInput.cs
index 004cc58..004cc58 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbUpInput.cs
index a4d8bf0..a4d8bf0 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSbtjb/LqSbtjbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhCrInput.cs
index 6c134ca..6c134ca 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhInfoOutput.cs
index fc2206d..fc2206d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhListOutput.cs
index 4b6b32f..4b6b32f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhListQueryInput.cs
index f0fc3ae..f0fc3ae 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhUpInput.cs
index 18bfda7..18bfda7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzhUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqSkzh/LqSkzhUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscCrInput.cs
index 45bf4ca..45bf4ca 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscInfoOutput.cs
index c2a840a..c2a840a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscListOutput.cs
index 6a3db24..6a3db24 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscListQueryInput.cs
index a1153b0..a1153b0 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscUpInput.cs
index 1464540..1464540 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXscUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkXsc/LqTkXscUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbCrInput.cs
index 9c6ad08..9c6ad08 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs
index 56b3264..56b3264 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs
index fd63c70..fd63c70 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListQueryInput.cs
index 910eda6..910eda6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbUpInput.cs
index 48934ba..48934ba 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqTkjlb/LqTkjlbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkCrInput.cs
index a67cca9..a67cca9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkInfoOutput.cs
index 52e618d..52e618d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListOutput.cs
index e06d5b2..e06d5b2 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
index d0bf8a1..d0bf8a1 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkUpInput.cs
index a45f01b..a45f01b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhkUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjCrInput.cs
index da44578..da44578 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs
index e6075ef..e6075ef 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyjInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjUpInput.cs
index 79e847f..79e847f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyjUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhJksyj/LqXhJksyjUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjCrInput.cs
index 2c0f19e..2c0f19e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyjCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjInfoOutput.cs
index 59f9617..59f9617 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyjInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjUpInput.cs
index d237cf6..d237cf6 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyjUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhKjbsyj/LqXhKjbsyjUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxCrInput.cs
index 8f98d85..8f98d85 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxInfoOutput.cs
index 82ffd30..82ffd30 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxUpInput.cs
index 3864819..3864819 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/LqXhPxmxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs
index f1979ed..f1979ed 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs
index 40e5812..40e5812 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs
index 76da088..76da088 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs
index e59cc72..e59cc72 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs
index 987c911..987c911 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhmxb/LqXhmxbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs
index 01108a3..0eb04e9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlCrInput.cs
@@ -83,5 +83,15 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public string qt2 { get; set; }
         
+        /// <summary>
+        /// 溯源金额
+        /// </summary>
+        public decimal? syje { get; set; }
+        
+        /// <summary>
+        /// Cell金额
+        /// </summary>
+        public decimal? cellje { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs
index 1bb7aaa..bae6929 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlInfoOutput.cs
@@ -83,5 +83,15 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public string qt2 { get; set; }
         
+        /// <summary>
+        /// 溯源金额
+        /// </summary>
+        public decimal? syje { get; set; }
+        
+        /// <summary>
+        /// Cell金额
+        /// </summary>
+        public decimal? cellje { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs
index 7899ad7..01f0d43 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListOutput.cs
@@ -82,5 +82,15 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public string qt2 { get; set; }
         
+        /// <summary>
+        /// 溯源金额
+        /// </summary>
+        public decimal? syje { get; set; }
+        
+        /// <summary>
+        /// Cell金额
+        /// </summary>
+        public decimal? cellje { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs
index c63d32d..1b06cde 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlListQueryInput.cs
@@ -94,5 +94,15 @@ namespace NCC.Extend.Entitys.Dto.LqXmzl
         /// </summary>
         public string qt2 { get; set; }
         
+        /// <summary>
+        /// 溯源金额
+        /// </summary>
+        public string syje { get; set; }
+        
+        /// <summary>
+        /// Cell金额
+        /// </summary>
+        public string cellje { get; set; }
+        
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlUpInput.cs
index ec504bb..ec504bb 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzlUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs
index 87f1486..87f1486 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs
index 2c9cce8..2c9cce8 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs
index e7cb08c..e7cb08c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListQueryInput.cs
index 36188b4..36188b4 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlUpInput.cs
index 418af5a..418af5a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjlUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYaoyjl/LqYaoyjlUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbCrInput.cs
index 79a6ebd..79a6ebd 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbInfoOutput.cs
index 867c60a..867c60a 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbListOutput.cs
index 832158b..832158b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbListQueryInput.cs
index 42cedac..42cedac 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbUpInput.cs
index de04291..de04291 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdDysbmxb/LqYcsdDysbmxbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszCrInput.cs
index c0d8821..c0d8821 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszInfoOutput.cs
index cfc7693..cfc7693 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszListOutput.cs
index 76d1888..76d1888 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszListQueryInput.cs
index e05f43e..e05f43e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszUpInput.cs
index 93dcbb5..93dcbb5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjszUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdGzhsfdtjsz/LqYcsdGzhsfdtjszUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsCrInput.cs
index d4c1729..d4c1729 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsInfoOutput.cs
index badb81e..badb81e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsListOutput.cs
index 59b3c05..59b3c05 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsListQueryInput.cs
index 216aab4..216aab4 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsUpInput.cs
index 992d76c..992d76c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjsUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJjlftjs/LqYcsdJjlftjsUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs
new file mode 100644
index 0000000..6f63c87
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjCrInput.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
+{
+    /// <summary>
+    /// 金三角设定创建输入参数
+    /// </summary>
+    public class LqYcsdJsjCrInput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 月份(yyyyMM格式)
+        /// </summary>
+        public string yf { get; set; }
+        
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string md { get; set; }
+        
+        /// <summary>
+        /// 金三角名称
+        /// </summary>
+        public string jsj { get; set; }
+        
+        /// <summary>
+        /// 金三角成员列表
+        /// </summary>
+        public List<JsjMemberInput> members { get; set; }
+    }
+    
+    /// <summary>
+    /// 金三角成员输入参数
+    /// </summary>
+    public class JsjMemberInput
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string userId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        public string userName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问(0-否,1-是)
+        /// </summary>
+        public int isLeader { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs
index be327a3..21bef34 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjInfoOutput.cs
@@ -1,37 +1,32 @@
 using System;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqYxhdfa
+namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
 {
     /// <summary>
-    /// 营销活动方案修改输入参数
+    /// 金三角设定输出参数
     /// </summary>
-    public class LqYxhdfaCrInput
+    public class LqYcsdJsjInfoOutput
     {
         /// <summary>
-        /// 方案编号
+        /// 主键
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 营销活动编号
+        /// 月份
         /// </summary>
-        public string yxhdbh { get; set; }
+        public string yf { get; set; }
         
         /// <summary>
-        /// 活动名称
+        /// 门店
         /// </summary>
-        public string hdmc { get; set; }
+        public string md { get; set; }
         
         /// <summary>
-        /// 张数奖
+        /// 金三角
         /// </summary>
-        public string zsj { get; set; }
-        
-        /// <summary>
-        /// 金额奖
-        /// </summary>
-        public string jej { get; set; }
+        public string jsj { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs
index 79e96e4..3aa2dd7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListOutput.cs
@@ -1,37 +1,31 @@
 using System;
-using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqYxhdfa
+namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
 {
     /// <summary>
-    /// 营销活动方案输出参数
+    /// 金三角设定输入参数
     /// </summary>
-    public class LqYxhdfaInfoOutput
+    public class LqYcsdJsjListOutput
     {
         /// <summary>
-        /// 方案编号
+        /// 主键
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 营销活动编号
+        /// 月份
         /// </summary>
-        public string yxhdbh { get; set; }
+        public string yf { get; set; }
         
         /// <summary>
-        /// 活动名称
+        /// 门店
         /// </summary>
-        public string hdmc { get; set; }
+        public string md { get; set; }
         
         /// <summary>
-        /// 张数奖
+        /// 金三角
         /// </summary>
-        public string zsj { get; set; }
-        
-        /// <summary>
-        /// 金额奖
-        /// </summary>
-        public string jej { get; set; }
+        public string jsj { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs
new file mode 100644
index 0000000..d1ad519
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjListQueryInput.cs
@@ -0,0 +1,43 @@
+using NCC.Common.Filter;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
+{
+    /// <summary>
+    /// 金三角设定列表查询输入
+    /// </summary>
+    public class LqYcsdJsjListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 选择导出数据key
+        /// </summary>
+        public string selectKey { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int dataType { get; set; }
+
+
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public string yf { get; set; }
+        
+        /// <summary>
+        /// 门店
+        /// </summary>
+        public string md { get; set; }
+        
+        /// <summary>
+        /// 金三角
+        /// </summary>
+        public string jsj { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjUpInput.cs
index d4a3f50..d4a3f50 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsj/LqYcsdJsjUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjCrInput.cs
deleted file mode 100644
index 9ab6e06..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjCrInput.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
-{
-    /// <summary>
-    /// 金三角设定修改输入参数
-    /// </summary>
-    public class LqYcsdJsjCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 月份
-        /// </summary>
-        public string yf { get; set; }
-        
-        /// <summary>
-        /// 门店
-        /// </summary>
-        public string md { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public decimal cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public decimal cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public decimal cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public decimal syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public int? cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public decimal xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public decimal zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public decimal jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public decimal hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public decimal jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public int? xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public int? sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public int? zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public int? kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public decimal zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public decimal ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public decimal zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public decimal jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public decimal hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        public decimal tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        public decimal grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        public decimal zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        public decimal gwtc { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjInfoOutput.cs
deleted file mode 100644
index 4064da6..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjInfoOutput.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
-{
-    /// <summary>
-    /// 金三角设定输出参数
-    /// </summary>
-    public class LqYcsdJsjInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 月份
-        /// </summary>
-        public string yf { get; set; }
-        
-        /// <summary>
-        /// 门店
-        /// </summary>
-        public string md { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public decimal cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public decimal cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public decimal cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public decimal syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public int? cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public decimal xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public decimal zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public decimal jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public decimal hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public decimal jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public int? xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public int? sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public int? zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public int? kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public decimal zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public decimal ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public decimal zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public decimal jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public decimal hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        public decimal tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        public decimal grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        public decimal zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        public decimal gwtc { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjListOutput.cs
deleted file mode 100644
index aa4adf0..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjListOutput.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
-{
-    /// <summary>
-    /// 金三角设定输入参数
-    /// </summary>
-    public class LqYcsdJsjListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 月份
-        /// </summary>
-        public string yf { get; set; }
-        
-        /// <summary>
-        /// 门店
-        /// </summary>
-        public string md { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public decimal cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public decimal cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public decimal cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public decimal syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public int? cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public decimal xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public decimal zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        public decimal jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        public decimal hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public decimal jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public int? xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public int? sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        public string fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        public int? zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        public int? kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        public decimal zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        public decimal ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
-        /// </summary>
-        public decimal zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        public decimal jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        public decimal hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        public decimal tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        public decimal grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        public decimal zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        public decimal gwtc { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxCrInput.cs
index 17206e3..17206e3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxInfoOutput.cs
index efc3f48..efc3f48 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxListOutput.cs
index 2bd760b..2bd760b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxListQueryInput.cs
index 356ba97..356ba97 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxUpInput.cs
index fc148e3..fc148e3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxxUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdlbjhsxx/LqYcsdMdlbjhsxxUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs
index 8120ae2..8120ae2 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs
index 2767a03..2767a03 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs
index e6d3972..e6d3972 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs
index 2b8199c..2b8199c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs
index 5e4ee13..5e4ee13 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsdUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdmbsd/LqYcsdMdmbsdUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbCrInput.cs
index d83e212..d83e212 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbInfoOutput.cs
index 4e9eb88..4e9eb88 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbListOutput.cs
index 7dc52a3..7dc52a3 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbListQueryInput.cs
index 75e34f5..75e34f5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbUpInput.cs
index 00af86e..00af86e 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMdtjbcbftb/LqYcsdMdtjbcbftbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdCrInput.cs
index ed0d19d..ed0d19d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdInfoOutput.cs
index 9518017..9518017 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdListOutput.cs
index 9dbe42c..9dbe42c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdListQueryInput.cs
index ad175e5..ad175e5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdListQueryInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdUpInput.cs
index 97fdc8f..97fdc8f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsdUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdMjpljdjsd/LqYcsdMjpljdjsdUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaCrInput.cs
index 4ee8fd7..4ee8fd7 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaCrInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaInfoOutput.cs
index 9bb4752..9bb4752 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaInfoOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaListOutput.cs
index fb546b9..fb546b9 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaListOutput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaListQueryInput.cs
new file mode 100644
index 0000000..d009cd9
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaListQueryInput.cs
@@ -0,0 +1,58 @@
+using NCC.Common.Filter;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYcsdZjljlhsfa
+{
+    /// <summary>
+    /// 总经理经理核算条件列表查询输入
+    /// </summary>
+    public class LqYcsdZjljlhsfaListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 选择导出数据key
+        /// </summary>
+        public string selectKey { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int dataType { get; set; }
+
+
+        /// <summary>
+        /// 核算编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 核算类型（总经理经理）
+        /// </summary>
+        public string hslx { get; set; }
+        
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 总经理
+        /// </summary>
+        public string zjl { get; set; }
+        
+        /// <summary>
+        /// 归属开始日期
+        /// </summary>
+        public string gsksrq { get; set; }
+        
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string jsrq { get; set; }
+        
+        /// <summary>
+        /// 提成核算方案
+        /// </summary>
+        public string tchsfa { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaUpInput.cs
index 20f4073..20f4073 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfa/LqYcsdZjljlhsfaUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaListQueryInput.cs
deleted file mode 100644
index d009cd9..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdZjljlhsfaListQueryInput.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYcsdZjljlhsfa
-{
-    /// <summary>
-    /// 总经理经理核算条件列表查询输入
-    /// </summary>
-    public class LqYcsdZjljlhsfaListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 核算编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 核算类型（总经理经理）
-        /// </summary>
-        public string hslx { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 总经理
-        /// </summary>
-        public string zjl { get; set; }
-        
-        /// <summary>
-        /// 归属开始日期
-        /// </summary>
-        public string gsksrq { get; set; }
-        
-        /// <summary>
-        /// 结束日期
-        /// </summary>
-        public string jsrq { get; set; }
-        
-        /// <summary>
-        /// 提成核算方案
-        /// </summary>
-        public string tchsfa { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbCrInput.cs
new file mode 100644
index 0000000..ff74eef
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbCrInput.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYjmxb
+{
+    /// <summary>
+    /// 业绩明细表修改输入参数
+    /// </summary>
+    public class LqYjmxbCrInput
+    {
+        /// <summary>
+        /// 业绩编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 发生时间
+        /// </summary>
+        public DateTime? fssj { get; set; }
+        
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 门店编号
+        /// </summary>
+        public string mdbh { get; set; }
+        
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string mdmc { get; set; }
+        
+        /// <summary>
+        /// 金三角
+        /// </summary>
+        public string jsj { get; set; }
+        
+        /// <summary>
+        /// 健康师
+        /// </summary>
+        public string jks { get; set; }
+        
+        /// <summary>
+        /// 项目编号
+        /// </summary>
+        public string xmbh { get; set; }
+        
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string xmmc { get; set; }
+        
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public string bm { get; set; }
+        
+        /// <summary>
+        /// 客户编号
+        /// </summary>
+        public string khbh { get; set; }
+        
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string khmc { get; set; }
+        
+        /// <summary>
+        /// 实收业绩
+        /// </summary>
+        public string ssyj { get; set; }
+        
+        /// <summary>
+        /// 欠款
+        /// </summary>
+        public string qk { get; set; }
+        
+        /// <summary>
+        /// 客户来源
+        /// </summary>
+        public string khly { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string bz { get; set; }
+        
+        /// <summary>
+        /// 总业绩
+        /// </summary>
+        public string zyj { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbInfoOutput.cs
new file mode 100644
index 0000000..2b92f52
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbInfoOutput.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYjmxb
+{
+    /// <summary>
+    /// 业绩明细表输出参数
+    /// </summary>
+    public class LqYjmxbInfoOutput
+    {
+        /// <summary>
+        /// 业绩编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 发生时间
+        /// </summary>
+        public DateTime? fssj { get; set; }
+        
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 门店编号
+        /// </summary>
+        public string mdbh { get; set; }
+        
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string mdmc { get; set; }
+        
+        /// <summary>
+        /// 金三角
+        /// </summary>
+        public string jsj { get; set; }
+        
+        /// <summary>
+        /// 健康师
+        /// </summary>
+        public string jks { get; set; }
+        
+        /// <summary>
+        /// 项目编号
+        /// </summary>
+        public string xmbh { get; set; }
+        
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string xmmc { get; set; }
+        
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public string bm { get; set; }
+        
+        /// <summary>
+        /// 客户编号
+        /// </summary>
+        public string khbh { get; set; }
+        
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string khmc { get; set; }
+        
+        /// <summary>
+        /// 实收业绩
+        /// </summary>
+        public string ssyj { get; set; }
+        
+        /// <summary>
+        /// 欠款
+        /// </summary>
+        public string qk { get; set; }
+        
+        /// <summary>
+        /// 客户来源
+        /// </summary>
+        public string khly { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string bz { get; set; }
+        
+        /// <summary>
+        /// 总业绩
+        /// </summary>
+        public string zyj { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbListOutput.cs
new file mode 100644
index 0000000..ffa9f74
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbListOutput.cs
@@ -0,0 +1,96 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqYjmxb
+{
+    /// <summary>
+    /// 业绩明细表输入参数
+    /// </summary>
+    public class LqYjmxbListOutput
+    {
+        /// <summary>
+        /// 业绩编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 发生时间
+        /// </summary>
+        public DateTime? fssj { get; set; }
+        
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        public string syb { get; set; }
+        
+        /// <summary>
+        /// 门店编号
+        /// </summary>
+        public string mdbh { get; set; }
+        
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string mdmc { get; set; }
+        
+        /// <summary>
+        /// 金三角
+        /// </summary>
+        public string jsj { get; set; }
+        
+        /// <summary>
+        /// 健康师
+        /// </summary>
+        public string jks { get; set; }
+        
+        /// <summary>
+        /// 项目编号
+        /// </summary>
+        public string xmbh { get; set; }
+        
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string xmmc { get; set; }
+        
+        /// <summary>
+        /// 部门
+        /// </summary>
+        public string bm { get; set; }
+        
+        /// <summary>
+        /// 客户编号
+        /// </summary>
+        public string khbh { get; set; }
+        
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string khmc { get; set; }
+        
+        /// <summary>
+        /// 实收业绩
+        /// </summary>
+        public string ssyj { get; set; }
+        
+        /// <summary>
+        /// 欠款
+        /// </summary>
+        public string qk { get; set; }
+        
+        /// <summary>
+        /// 客户来源
+        /// </summary>
+        public string khly { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string bz { get; set; }
+        
+        /// <summary>
+        /// 总业绩
+        /// </summary>
+        public string zyj { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbListQueryInput.cs
index c89d978..3870f8c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYcsdJsjListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbListQueryInput.cs
@@ -1,12 +1,12 @@
 using NCC.Common.Filter;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
+namespace NCC.Extend.Entitys.Dto.LqYjmxb
 {
     /// <summary>
-    /// 金三角设定列表查询输入
+    /// 业绩明细表列表查询输入
     /// </summary>
-    public class LqYcsdJsjListQueryInput : PageInputBase
+    public class LqYjmxbListQueryInput : PageInputBase
     {
         /// <summary>
         /// 选择导出数据key
@@ -20,159 +20,89 @@ namespace NCC.Extend.Entitys.Dto.LqYcsdJsj
 
 
         /// <summary>
-        /// 主键
+        /// 业绩编号
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 月份
+        /// 发生时间
         /// </summary>
-        public string yf { get; set; }
+        public string fssj { get; set; }
         
         /// <summary>
-        /// 门店
+        /// 事业部
         /// </summary>
-        public string md { get; set; }
+        public string syb { get; set; }
         
         /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 岗位
-        /// </summary>
-        public string gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        public string cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        public string cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        public string cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        public string syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        public string cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        public string xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public string zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
+        /// 门店编号
         /// </summary>
-        public string jcyj { get; set; }
+        public string mdbh { get; set; }
         
         /// <summary>
-        /// 合作业绩
+        /// 门店名称
         /// </summary>
-        public string hzyj { get; set; }
+        public string mdmc { get; set; }
         
         /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        public string jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        public string xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        public string sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        public string sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
+        /// 金三角
         /// </summary>
-        public string fsmzkq { get; set; }
+        public string jsj { get; set; }
         
         /// <summary>
-        /// ③战队最终人数
+        /// 健康师
         /// </summary>
-        public string zdzzrs { get; set; }
+        public string jks { get; set; }
         
         /// <summary>
-        /// ④考勤后不属于战队视为单人
+        /// 项目编号
         /// </summary>
-        public string kqhbsyzd { get; set; }
+        public string xmbh { get; set; }
         
         /// <summary>
-        /// ⑤战队提成
+        /// 项目名称
         /// </summary>
-        public string zdtc { get; set; }
+        public string xmmc { get; set; }
         
         /// <summary>
-        /// ⑥按1人提成
+        /// 部门
         /// </summary>
-        public string ayrtc { get; set; }
+        public string bm { get; set; }
         
         /// <summary>
-        /// 最终提成点
+        /// 客户编号
         /// </summary>
-        public string zztcd { get; set; }
+        public string khbh { get; set; }
         
         /// <summary>
-        /// 基础业绩提成
+        /// 客户名称
         /// </summary>
-        public string jcyjtc { get; set; }
+        public string khmc { get; set; }
         
         /// <summary>
-        /// 合作业绩提成
+        /// 实收业绩
         /// </summary>
-        public string hzyjtc { get; set; }
+        public string ssyj { get; set; }
         
         /// <summary>
-        /// 提成合计
+        /// 欠款
         /// </summary>
-        public string tchj { get; set; }
+        public string qk { get; set; }
         
         /// <summary>
-        /// 个人占比
+        /// 客户来源
         /// </summary>
-        public string grzb { get; set; }
+        public string khly { get; set; }
         
         /// <summary>
-        /// 组员合计
+        /// 备注
         /// </summary>
-        public string zyhj { get; set; }
+        public string bz { get; set; }
         
         /// <summary>
-        /// 顾问提成
+        /// 总业绩
         /// </summary>
-        public string gwtc { get; set; }
+        public string zyj { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbUpInput.cs
index 2e32c84..2e32c84 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxb/LqYjmxbUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbCrInput.cs
deleted file mode 100644
index ff74eef..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbCrInput.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYjmxb
-{
-    /// <summary>
-    /// 业绩明细表修改输入参数
-    /// </summary>
-    public class LqYjmxbCrInput
-    {
-        /// <summary>
-        /// 业绩编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 发生时间
-        /// </summary>
-        public DateTime? fssj { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 项目编号
-        /// </summary>
-        public string xmbh { get; set; }
-        
-        /// <summary>
-        /// 项目名称
-        /// </summary>
-        public string xmmc { get; set; }
-        
-        /// <summary>
-        /// 部门
-        /// </summary>
-        public string bm { get; set; }
-        
-        /// <summary>
-        /// 客户编号
-        /// </summary>
-        public string khbh { get; set; }
-        
-        /// <summary>
-        /// 客户名称
-        /// </summary>
-        public string khmc { get; set; }
-        
-        /// <summary>
-        /// 实收业绩
-        /// </summary>
-        public string ssyj { get; set; }
-        
-        /// <summary>
-        /// 欠款
-        /// </summary>
-        public string qk { get; set; }
-        
-        /// <summary>
-        /// 客户来源
-        /// </summary>
-        public string khly { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string bz { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public string zyj { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbInfoOutput.cs
deleted file mode 100644
index 2b92f52..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbInfoOutput.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYjmxb
-{
-    /// <summary>
-    /// 业绩明细表输出参数
-    /// </summary>
-    public class LqYjmxbInfoOutput
-    {
-        /// <summary>
-        /// 业绩编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 发生时间
-        /// </summary>
-        public DateTime? fssj { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 项目编号
-        /// </summary>
-        public string xmbh { get; set; }
-        
-        /// <summary>
-        /// 项目名称
-        /// </summary>
-        public string xmmc { get; set; }
-        
-        /// <summary>
-        /// 部门
-        /// </summary>
-        public string bm { get; set; }
-        
-        /// <summary>
-        /// 客户编号
-        /// </summary>
-        public string khbh { get; set; }
-        
-        /// <summary>
-        /// 客户名称
-        /// </summary>
-        public string khmc { get; set; }
-        
-        /// <summary>
-        /// 实收业绩
-        /// </summary>
-        public string ssyj { get; set; }
-        
-        /// <summary>
-        /// 欠款
-        /// </summary>
-        public string qk { get; set; }
-        
-        /// <summary>
-        /// 客户来源
-        /// </summary>
-        public string khly { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string bz { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public string zyj { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbListOutput.cs
deleted file mode 100644
index ffa9f74..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbListOutput.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqYjmxb
-{
-    /// <summary>
-    /// 业绩明细表输入参数
-    /// </summary>
-    public class LqYjmxbListOutput
-    {
-        /// <summary>
-        /// 业绩编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 发生时间
-        /// </summary>
-        public DateTime? fssj { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 项目编号
-        /// </summary>
-        public string xmbh { get; set; }
-        
-        /// <summary>
-        /// 项目名称
-        /// </summary>
-        public string xmmc { get; set; }
-        
-        /// <summary>
-        /// 部门
-        /// </summary>
-        public string bm { get; set; }
-        
-        /// <summary>
-        /// 客户编号
-        /// </summary>
-        public string khbh { get; set; }
-        
-        /// <summary>
-        /// 客户名称
-        /// </summary>
-        public string khmc { get; set; }
-        
-        /// <summary>
-        /// 实收业绩
-        /// </summary>
-        public string ssyj { get; set; }
-        
-        /// <summary>
-        /// 欠款
-        /// </summary>
-        public string qk { get; set; }
-        
-        /// <summary>
-        /// 客户来源
-        /// </summary>
-        public string khly { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string bz { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public string zyj { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbListQueryInput.cs
deleted file mode 100644
index 3870f8c..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYjmxbListQueryInput.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYjmxb
-{
-    /// <summary>
-    /// 业绩明细表列表查询输入
-    /// </summary>
-    public class LqYjmxbListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 业绩编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 发生时间
-        /// </summary>
-        public string fssj { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        public string syb { get; set; }
-        
-        /// <summary>
-        /// 门店编号
-        /// </summary>
-        public string mdbh { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        public string mdmc { get; set; }
-        
-        /// <summary>
-        /// 金三角
-        /// </summary>
-        public string jsj { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        public string jks { get; set; }
-        
-        /// <summary>
-        /// 项目编号
-        /// </summary>
-        public string xmbh { get; set; }
-        
-        /// <summary>
-        /// 项目名称
-        /// </summary>
-        public string xmmc { get; set; }
-        
-        /// <summary>
-        /// 部门
-        /// </summary>
-        public string bm { get; set; }
-        
-        /// <summary>
-        /// 客户编号
-        /// </summary>
-        public string khbh { get; set; }
-        
-        /// <summary>
-        /// 客户名称
-        /// </summary>
-        public string khmc { get; set; }
-        
-        /// <summary>
-        /// 实收业绩
-        /// </summary>
-        public string ssyj { get; set; }
-        
-        /// <summary>
-        /// 欠款
-        /// </summary>
-        public string qk { get; set; }
-        
-        /// <summary>
-        /// 客户来源
-        /// </summary>
-        public string khly { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string bz { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        public string zyj { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaCrInput.cs
new file mode 100644
index 0000000..be327a3
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaCrInput.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYxhdfa
+{
+    /// <summary>
+    /// 营销活动方案修改输入参数
+    /// </summary>
+    public class LqYxhdfaCrInput
+    {
+        /// <summary>
+        /// 方案编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 营销活动编号
+        /// </summary>
+        public string yxhdbh { get; set; }
+        
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string hdmc { get; set; }
+        
+        /// <summary>
+        /// 张数奖
+        /// </summary>
+        public string zsj { get; set; }
+        
+        /// <summary>
+        /// 金额奖
+        /// </summary>
+        public string jej { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaInfoOutput.cs
new file mode 100644
index 0000000..79e96e4
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaInfoOutput.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYxhdfa
+{
+    /// <summary>
+    /// 营销活动方案输出参数
+    /// </summary>
+    public class LqYxhdfaInfoOutput
+    {
+        /// <summary>
+        /// 方案编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 营销活动编号
+        /// </summary>
+        public string yxhdbh { get; set; }
+        
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string hdmc { get; set; }
+        
+        /// <summary>
+        /// 张数奖
+        /// </summary>
+        public string zsj { get; set; }
+        
+        /// <summary>
+        /// 金额奖
+        /// </summary>
+        public string jej { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaListOutput.cs
new file mode 100644
index 0000000..7f3714d
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaListOutput.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.LqYxhdfa
+{
+    /// <summary>
+    /// 营销活动方案输入参数
+    /// </summary>
+    public class LqYxhdfaListOutput
+    {
+        /// <summary>
+        /// 方案编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 营销活动编号
+        /// </summary>
+        public string yxhdbh { get; set; }
+        
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string hdmc { get; set; }
+        
+        /// <summary>
+        /// 张数奖
+        /// </summary>
+        public string zsj { get; set; }
+        
+        /// <summary>
+        /// 金额奖
+        /// </summary>
+        public string jej { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaListQueryInput.cs
new file mode 100644
index 0000000..b1d7bfc
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaListQueryInput.cs
@@ -0,0 +1,48 @@
+using NCC.Common.Filter;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.LqYxhdfa
+{
+    /// <summary>
+    /// 营销活动方案列表查询输入
+    /// </summary>
+    public class LqYxhdfaListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 选择导出数据key
+        /// </summary>
+        public string selectKey { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int dataType { get; set; }
+
+
+        /// <summary>
+        /// 方案编号
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 营销活动编号
+        /// </summary>
+        public string yxhdbh { get; set; }
+        
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string hdmc { get; set; }
+        
+        /// <summary>
+        /// 张数奖
+        /// </summary>
+        public string zsj { get; set; }
+        
+        /// <summary>
+        /// 金额奖
+        /// </summary>
+        public string jej { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaUpInput.cs
index 795206c..795206c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfa/LqYxhdfaUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaListOutput.cs
deleted file mode 100644
index 7f3714d..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaListOutput.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqYxhdfa
-{
-    /// <summary>
-    /// 营销活动方案输入参数
-    /// </summary>
-    public class LqYxhdfaListOutput
-    {
-        /// <summary>
-        /// 方案编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 营销活动编号
-        /// </summary>
-        public string yxhdbh { get; set; }
-        
-        /// <summary>
-        /// 活动名称
-        /// </summary>
-        public string hdmc { get; set; }
-        
-        /// <summary>
-        /// 张数奖
-        /// </summary>
-        public string zsj { get; set; }
-        
-        /// <summary>
-        /// 金额奖
-        /// </summary>
-        public string jej { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaListQueryInput.cs
deleted file mode 100644
index b1d7bfc..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYxhdfaListQueryInput.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYxhdfa
-{
-    /// <summary>
-    /// 营销活动方案列表查询输入
-    /// </summary>
-    public class LqYxhdfaListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 方案编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 营销活动编号
-        /// </summary>
-        public string yxhdbh { get; set; }
-        
-        /// <summary>
-        /// 活动名称
-        /// </summary>
-        public string hdmc { get; set; }
-        
-        /// <summary>
-        /// 张数奖
-        /// </summary>
-        public string zsj { get; set; }
-        
-        /// <summary>
-        /// 金额奖
-        /// </summary>
-        public string jej { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlCrInput.cs
index cfd726a..e548297 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsCrInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlCrInput.cs
@@ -1,67 +1,72 @@
 using System;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.LqYyjl
 {
     /// <summary>
-    /// 门店归属修改输入参数
+    /// 预约记录修改输入参数
     /// </summary>
-    public class LqMdMdgsCrInput
+    public class LqYyjlCrInput
     {
         /// <summary>
-        /// 门店编码
+        /// 预约编号
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 单据门店编号
+        /// 单据门店
         /// </summary>
-        public string djmdbh { get; set; }
+        public string djmd { get; set; }
         
         /// <summary>
-        /// 单据门店
+        /// 邀约人
         /// </summary>
-        public string djmd { get; set; }
+        public string yyr { get; set; }
+        
+        /// <summary>
+        /// 顾客类型
+        /// </summary>
+        public string gklx { get; set; }
         
         /// <summary>
-        /// 门店名称
+        /// 预约体验项目
         /// </summary>
-        public string mdmc { get; set; }
+        public string yytyxm { get; set; }
         
         /// <summary>
-        /// 事业部
+        /// 操作人
         /// </summary>
-        public string syb { get; set; }
+        public string czr { get; set; }
         
         /// <summary>
-        /// 教育部
+        /// 操作时间
         /// </summary>
-        public string jyb { get; set; }
+        public DateTime? czsj { get; set; }
         
         /// <summary>
-        /// 科技部
+        /// 顾客
         /// </summary>
-        public string kjb { get; set; }
+        public string gk { get; set; }
         
         /// <summary>
-        /// 大项目部
+        /// 顾客姓名
         /// </summary>
-        public string dxmb { get; set; }
+        public string gkxm { get; set; }
         
         /// <summary>
-        /// 归属起始时间
+        /// 预约健康师
         /// </summary>
-        public DateTime? gsqssj { get; set; }
+        public string yyjks { get; set; }
         
         /// <summary>
-        /// 归属终止时间
+        /// 预约开始时间
         /// </summary>
-        public DateTime? gszzsj { get; set; }
+        public DateTime? yysj { get; set; }
         
         /// <summary>
-        /// 修改信息
+        /// 预约结束时间
         /// </summary>
-        public string xgxx { get; set; }
+        public DateTime? yyjs { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs
index 0237076..268605c 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsInfoOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlInfoOutput.cs
@@ -1,67 +1,72 @@
 using System;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.LqYyjl
 {
     /// <summary>
-    /// 门店归属输出参数
+    /// 预约记录输出参数
     /// </summary>
-    public class LqMdMdgsInfoOutput
+    public class LqYyjlInfoOutput
     {
         /// <summary>
-        /// 门店编码
+        /// 预约编号
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 单据门店编号
+        /// 单据门店
         /// </summary>
-        public string djmdbh { get; set; }
+        public string djmd { get; set; }
         
         /// <summary>
-        /// 单据门店
+        /// 邀约人
         /// </summary>
-        public string djmd { get; set; }
+        public string yyr { get; set; }
+        
+        /// <summary>
+        /// 顾客类型
+        /// </summary>
+        public string gklx { get; set; }
         
         /// <summary>
-        /// 门店名称
+        /// 预约体验项目
         /// </summary>
-        public string mdmc { get; set; }
+        public string yytyxm { get; set; }
         
         /// <summary>
-        /// 事业部
+        /// 操作人
         /// </summary>
-        public string syb { get; set; }
+        public string czr { get; set; }
         
         /// <summary>
-        /// 教育部
+        /// 操作时间
         /// </summary>
-        public string jyb { get; set; }
+        public DateTime? czsj { get; set; }
         
         /// <summary>
-        /// 科技部
+        /// 顾客
         /// </summary>
-        public string kjb { get; set; }
+        public string gk { get; set; }
         
         /// <summary>
-        /// 大项目部
+        /// 顾客姓名
         /// </summary>
-        public string dxmb { get; set; }
+        public string gkxm { get; set; }
         
         /// <summary>
-        /// 归属起始时间
+        /// 预约健康师
         /// </summary>
-        public DateTime? gsqssj { get; set; }
+        public string yyjks { get; set; }
         
         /// <summary>
-        /// 归属终止时间
+        /// 预约开始时间
         /// </summary>
-        public DateTime? gszzsj { get; set; }
+        public DateTime? yysj { get; set; }
         
         /// <summary>
-        /// 修改信息
+        /// 预约结束时间
         /// </summary>
-        public string xgxx { get; set; }
+        public DateTime? yyjs { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs
index 0e2b192..1dafe1b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsListOutput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListOutput.cs
@@ -1,66 +1,71 @@
 using System;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.LqYyjl
 {
     /// <summary>
-    /// 门店归属输入参数
+    /// 预约记录输入参数
     /// </summary>
-    public class LqMdMdgsListOutput
+    public class LqYyjlListOutput
     {
         /// <summary>
-        /// 门店编码
+        /// 预约编号
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 单据门店编号
+        /// 单据门店
         /// </summary>
-        public string djmdbh { get; set; }
+        public string djmd { get; set; }
         
         /// <summary>
-        /// 单据门店
+        /// 邀约人
         /// </summary>
-        public string djmd { get; set; }
+        public string yyr { get; set; }
+        
+        /// <summary>
+        /// 顾客类型
+        /// </summary>
+        public string gklx { get; set; }
         
         /// <summary>
-        /// 门店名称
+        /// 预约体验项目
         /// </summary>
-        public string mdmc { get; set; }
+        public string yytyxm { get; set; }
         
         /// <summary>
-        /// 事业部
+        /// 操作人
         /// </summary>
-        public string syb { get; set; }
+        public string czr { get; set; }
         
         /// <summary>
-        /// 教育部
+        /// 操作时间
         /// </summary>
-        public string jyb { get; set; }
+        public DateTime? czsj { get; set; }
         
         /// <summary>
-        /// 科技部
+        /// 顾客
         /// </summary>
-        public string kjb { get; set; }
+        public string gk { get; set; }
         
         /// <summary>
-        /// 大项目部
+        /// 顾客姓名
         /// </summary>
-        public string dxmb { get; set; }
+        public string gkxm { get; set; }
         
         /// <summary>
-        /// 归属起始时间
+        /// 预约健康师
         /// </summary>
-        public DateTime? gsqssj { get; set; }
+        public string yyjks { get; set; }
         
         /// <summary>
-        /// 归属终止时间
+        /// 预约开始时间
         /// </summary>
-        public DateTime? gszzsj { get; set; }
+        public DateTime? yysj { get; set; }
         
         /// <summary>
-        /// 修改信息
+        /// 预约结束时间
         /// </summary>
-        public string xgxx { get; set; }
+        public DateTime? yyjs { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListQueryInput.cs
index 9c0e998..af28b65 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsListQueryInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlListQueryInput.cs
@@ -1,12 +1,12 @@
 using NCC.Common.Filter;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.LqYyjl
 {
     /// <summary>
-    /// 门店归属列表查询输入
+    /// 预约记录列表查询输入
     /// </summary>
-    public class LqMdMdgsListQueryInput : PageInputBase
+    public class LqYyjlListQueryInput : PageInputBase
     {
         /// <summary>
         /// 选择导出数据key
@@ -20,59 +20,64 @@ namespace NCC.Extend.Entitys.Dto.LqMdMdgs
 
 
         /// <summary>
-        /// 门店编码
+        /// 预约编号
         /// </summary>
         public string id { get; set; }
         
         /// <summary>
-        /// 单据门店编号
+        /// 单据门店
         /// </summary>
-        public string djmdbh { get; set; }
+        public string djmd { get; set; }
         
         /// <summary>
-        /// 单据门店
+        /// 邀约人
         /// </summary>
-        public string djmd { get; set; }
+        public string yyr { get; set; }
+        
+        /// <summary>
+        /// 顾客类型
+        /// </summary>
+        public string gklx { get; set; }
         
         /// <summary>
-        /// 门店名称
+        /// 预约体验项目
         /// </summary>
-        public string mdmc { get; set; }
+        public string yytyxm { get; set; }
         
         /// <summary>
-        /// 事业部
+        /// 操作人
         /// </summary>
-        public string syb { get; set; }
+        public string czr { get; set; }
         
         /// <summary>
-        /// 教育部
+        /// 操作时间
         /// </summary>
-        public string jyb { get; set; }
+        public string czsj { get; set; }
         
         /// <summary>
-        /// 科技部
+        /// 顾客
         /// </summary>
-        public string kjb { get; set; }
+        public string gk { get; set; }
         
         /// <summary>
-        /// 大项目部
+        /// 顾客姓名
         /// </summary>
-        public string dxmb { get; set; }
+        public string gkxm { get; set; }
         
         /// <summary>
-        /// 归属起始时间
+        /// 预约健康师
         /// </summary>
-        public string gsqssj { get; set; }
+        public string yyjks { get; set; }
         
         /// <summary>
-        /// 归属终止时间
+        /// 预约开始时间
         /// </summary>
-        public string gszzsj { get; set; }
+        public string yysj { get; set; }
         
         /// <summary>
-        /// 修改信息
+        /// 预约结束时间
         /// </summary>
-        public string xgxx { get; set; }
+        public string yyjs { get; set; }
         
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlUpInput.cs
index 7e71553..7e71553 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjl/LqYyjlUpInput.cs
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlCrInput.cs
deleted file mode 100644
index e548297..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlCrInput.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYyjl
-{
-    /// <summary>
-    /// 预约记录修改输入参数
-    /// </summary>
-    public class LqYyjlCrInput
-    {
-        /// <summary>
-        /// 预约编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        public string djmd { get; set; }
-        
-        /// <summary>
-        /// 邀约人
-        /// </summary>
-        public string yyr { get; set; }
-        
-        /// <summary>
-        /// 顾客类型
-        /// </summary>
-        public string gklx { get; set; }
-        
-        /// <summary>
-        /// 预约体验项目
-        /// </summary>
-        public string yytyxm { get; set; }
-        
-        /// <summary>
-        /// 操作人
-        /// </summary>
-        public string czr { get; set; }
-        
-        /// <summary>
-        /// 操作时间
-        /// </summary>
-        public DateTime? czsj { get; set; }
-        
-        /// <summary>
-        /// 顾客
-        /// </summary>
-        public string gk { get; set; }
-        
-        /// <summary>
-        /// 顾客姓名
-        /// </summary>
-        public string gkxm { get; set; }
-        
-        /// <summary>
-        /// 预约健康师
-        /// </summary>
-        public string yyjks { get; set; }
-        
-        /// <summary>
-        /// 预约开始时间
-        /// </summary>
-        public DateTime? yysj { get; set; }
-        
-        /// <summary>
-        /// 预约结束时间
-        /// </summary>
-        public DateTime? yyjs { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlInfoOutput.cs
deleted file mode 100644
index 268605c..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlInfoOutput.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYyjl
-{
-    /// <summary>
-    /// 预约记录输出参数
-    /// </summary>
-    public class LqYyjlInfoOutput
-    {
-        /// <summary>
-        /// 预约编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        public string djmd { get; set; }
-        
-        /// <summary>
-        /// 邀约人
-        /// </summary>
-        public string yyr { get; set; }
-        
-        /// <summary>
-        /// 顾客类型
-        /// </summary>
-        public string gklx { get; set; }
-        
-        /// <summary>
-        /// 预约体验项目
-        /// </summary>
-        public string yytyxm { get; set; }
-        
-        /// <summary>
-        /// 操作人
-        /// </summary>
-        public string czr { get; set; }
-        
-        /// <summary>
-        /// 操作时间
-        /// </summary>
-        public DateTime? czsj { get; set; }
-        
-        /// <summary>
-        /// 顾客
-        /// </summary>
-        public string gk { get; set; }
-        
-        /// <summary>
-        /// 顾客姓名
-        /// </summary>
-        public string gkxm { get; set; }
-        
-        /// <summary>
-        /// 预约健康师
-        /// </summary>
-        public string yyjks { get; set; }
-        
-        /// <summary>
-        /// 预约开始时间
-        /// </summary>
-        public DateTime? yysj { get; set; }
-        
-        /// <summary>
-        /// 预约结束时间
-        /// </summary>
-        public DateTime? yyjs { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlListOutput.cs
deleted file mode 100644
index 1dafe1b..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlListOutput.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.LqYyjl
-{
-    /// <summary>
-    /// 预约记录输入参数
-    /// </summary>
-    public class LqYyjlListOutput
-    {
-        /// <summary>
-        /// 预约编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        public string djmd { get; set; }
-        
-        /// <summary>
-        /// 邀约人
-        /// </summary>
-        public string yyr { get; set; }
-        
-        /// <summary>
-        /// 顾客类型
-        /// </summary>
-        public string gklx { get; set; }
-        
-        /// <summary>
-        /// 预约体验项目
-        /// </summary>
-        public string yytyxm { get; set; }
-        
-        /// <summary>
-        /// 操作人
-        /// </summary>
-        public string czr { get; set; }
-        
-        /// <summary>
-        /// 操作时间
-        /// </summary>
-        public DateTime? czsj { get; set; }
-        
-        /// <summary>
-        /// 顾客
-        /// </summary>
-        public string gk { get; set; }
-        
-        /// <summary>
-        /// 顾客姓名
-        /// </summary>
-        public string gkxm { get; set; }
-        
-        /// <summary>
-        /// 预约健康师
-        /// </summary>
-        public string yyjks { get; set; }
-        
-        /// <summary>
-        /// 预约开始时间
-        /// </summary>
-        public DateTime? yysj { get; set; }
-        
-        /// <summary>
-        /// 预约结束时间
-        /// </summary>
-        public DateTime? yyjs { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlListQueryInput.cs
deleted file mode 100644
index af28b65..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqYyjlListQueryInput.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.LqYyjl
-{
-    /// <summary>
-    /// 预约记录列表查询输入
-    /// </summary>
-    public class LqYyjlListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 预约编号
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        public string djmd { get; set; }
-        
-        /// <summary>
-        /// 邀约人
-        /// </summary>
-        public string yyr { get; set; }
-        
-        /// <summary>
-        /// 顾客类型
-        /// </summary>
-        public string gklx { get; set; }
-        
-        /// <summary>
-        /// 预约体验项目
-        /// </summary>
-        public string yytyxm { get; set; }
-        
-        /// <summary>
-        /// 操作人
-        /// </summary>
-        public string czr { get; set; }
-        
-        /// <summary>
-        /// 操作时间
-        /// </summary>
-        public string czsj { get; set; }
-        
-        /// <summary>
-        /// 顾客
-        /// </summary>
-        public string gk { get; set; }
-        
-        /// <summary>
-        /// 顾客姓名
-        /// </summary>
-        public string gkxm { get; set; }
-        
-        /// <summary>
-        /// 预约健康师
-        /// </summary>
-        public string yyjks { get; set; }
-        
-        /// <summary>
-        /// 预约开始时间
-        /// </summary>
-        public string yysj { get; set; }
-        
-        /// <summary>
-        /// 预约结束时间
-        /// </summary>
-        public string yyjs { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListOutput.cs
new file mode 100644
index 0000000..6733be8
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListOutput.cs
@@ -0,0 +1,75 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.Organize
+{
+    /// <summary>
+    /// 组织架构列表输出
+    /// </summary>
+    public class OrganizeListOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 组织名称
+        /// </summary>
+        public string FullName { get; set; }
+
+        /// <summary>
+        /// 组织编码
+        /// </summary>
+        public string EnCode { get; set; }
+
+        /// <summary>
+        /// 组织分类【company-公司、department-部门】
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 父级组织ID
+        /// </summary>
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// 父级组织名称
+        /// </summary>
+        public string ParentName { get; set; }
+
+        /// <summary>
+        /// 组织主管ID
+        /// </summary>
+        public string ManagerId { get; set; }
+
+        /// <summary>
+        /// 组织主管姓名
+        /// </summary>
+        public string ManagerName { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        public long? SortCode { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int? EnabledMark { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreatorTime { get; set; }
+
+        /// <summary>
+        /// 子组织数量
+        /// </summary>
+        public int ChildrenCount { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListQueryInput.cs
new file mode 100644
index 0000000..655dd00
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeListQueryInput.cs
@@ -0,0 +1,35 @@
+using NCC.Common.Filter;
+
+namespace NCC.Extend.Entitys.Dto.Organize
+{
+    /// <summary>
+    /// 组织架构查询输入参数
+    /// </summary>
+    public class OrganizeListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 组织名称（模糊查询）
+        /// </summary>
+        public string FullName { get; set; }
+
+        /// <summary>
+        /// 组织编码
+        /// </summary>
+        public string EnCode { get; set; }
+
+        /// <summary>
+        /// 组织分类【company-公司、department-部门】
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 父级组织ID
+        /// </summary>
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int? EnabledMark { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeTreeOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeTreeOutput.cs
new file mode 100644
index 0000000..ee8716b
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/Organize/OrganizeTreeOutput.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.Organize
+{
+    /// <summary>
+    /// 组织架构树形输出
+    /// </summary>
+    public class OrganizeTreeOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 组织名称
+        /// </summary>
+        public string FullName { get; set; }
+
+        /// <summary>
+        /// 组织编码
+        /// </summary>
+        public string EnCode { get; set; }
+
+        /// <summary>
+        /// 组织分类【company-公司、department-部门】
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 父级组织ID
+        /// </summary>
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// 组织主管ID
+        /// </summary>
+        public string ManagerId { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        public long? SortCode { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int? EnabledMark { get; set; }
+
+        /// <summary>
+        /// 子组织列表
+        /// </summary>
+        public List<OrganizeTreeOutput> Children { get; set; } = new List<OrganizeTreeOutput>();
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestCrInput.cs
new file mode 100644
index 0000000..0a836b1
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestCrInput.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.TbTest
+{
+    /// <summary>
+    /// 测试列表修改输入参数
+    /// </summary>
+    public class TbTestCrInput
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name { get; set; }
+        
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public int? age { get; set; }
+        
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string remark { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestInfoOutput.cs
new file mode 100644
index 0000000..7476cb7
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestInfoOutput.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.TbTest
+{
+    /// <summary>
+    /// 测试列表输出参数
+    /// </summary>
+    public class TbTestInfoOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name { get; set; }
+        
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public int? age { get; set; }
+        
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string remark { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int? status { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestListOutput.cs
new file mode 100644
index 0000000..6ca596b
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestListOutput.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.TbTest
+{
+    /// <summary>
+    /// 测试列表输入参数
+    /// </summary>
+    public class TbTestListOutput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name { get; set; }
+        
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public int? age { get; set; }
+        
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string remark { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+
+        public string userName { get; set; }
+
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestListQueryInput.cs
new file mode 100644
index 0000000..32ec6de
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestListQueryInput.cs
@@ -0,0 +1,48 @@
+using NCC.Common.Filter;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.TbTest
+{
+    /// <summary>
+    /// 测试列表列表查询输入
+    /// </summary>
+    public class TbTestListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 选择导出数据key
+        /// </summary>
+        public string selectKey { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int dataType { get; set; }
+
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name { get; set; }
+        
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public string age { get; set; }
+        
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string remark { get; set; }
+        
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string creatorTime { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestUpInput.cs
index 738dd62..0b0550d 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdMdgsUpInput.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTest/TbTestUpInput.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 
-namespace NCC.Extend.Entitys.Dto.LqMdMdgs
+namespace NCC.Extend.Entitys.Dto.TbTest
 {
     /// <summary>
-    /// 门店归属更新输入参数
+    /// 测试列表更新输入参数
     /// </summary>
-    public class LqMdMdgsUpInput : LqMdMdgsCrInput
+    public class TbTestUpInput : TbTestCrInput
     {
         /// <summary>
-        /// 门店编码
+        /// 主键
         /// </summary>
         public string id { get; set; }
         
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestCrInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestCrInput.cs
deleted file mode 100644
index 0a836b1..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestCrInput.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.TbTest
-{
-    /// <summary>
-    /// 测试列表修改输入参数
-    /// </summary>
-    public class TbTestCrInput
-    {
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public int? age { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestInfoOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestInfoOutput.cs
deleted file mode 100644
index 7476cb7..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestInfoOutput.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.TbTest
-{
-    /// <summary>
-    /// 测试列表输出参数
-    /// </summary>
-    public class TbTestInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public int? age { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int? status { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestListOutput.cs
deleted file mode 100644
index 6ca596b..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestListOutput.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-
-namespace NCC.Extend.Entitys.Dto.TbTest
-{
-    /// <summary>
-    /// 测试列表输入参数
-    /// </summary>
-    public class TbTestListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public int? age { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-
-        public string userName { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestListQueryInput.cs
deleted file mode 100644
index 32ec6de..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestListQueryInput.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.TbTest
-{
-    /// <summary>
-    /// 测试列表列表查询输入
-    /// </summary>
-    public class TbTestListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        public string age { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public string creatorTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestUpInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestUpInput.cs
deleted file mode 100644
index 0b0550d..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/TbTestUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Dto.TbTest
-{
-    /// <summary>
-    /// 测试列表更新输入参数
-    /// </summary>
-    public class TbTestUpInput : TbTestCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/User/UserListOutput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/User/UserListOutput.cs
new file mode 100644
index 0000000..5adc112
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/User/UserListOutput.cs
@@ -0,0 +1,206 @@
+using System;
+
+namespace NCC.Extend.Entitys.Dto.User
+{
+    /// <summary>
+    /// 用户列表输出参数
+    /// </summary>
+    public class UserListOutput
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 账户
+        /// </summary>
+        public string account { get; set; }
+        
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string realName { get; set; }
+        
+        /// <summary>
+        /// 呢称
+        /// </summary>
+        public string nickName { get; set; }
+        
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string headIcon { get; set; }
+        
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public int? gender { get; set; }
+        
+        /// <summary>
+        /// 生日
+        /// </summary>
+        public DateTime? birthday { get; set; }
+        
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string mobilePhone { get; set; }
+        
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string telePhone { get; set; }
+        
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string email { get; set; }
+        
+        /// <summary>
+        /// 微信
+        /// </summary>
+        public string weChat { get; set; }
+        
+        /// <summary>
+        /// 紧急联系人
+        /// </summary>
+        public string urgentContacts { get; set; }
+        
+        /// <summary>
+        /// 紧急联系人电话
+        /// </summary>
+        public string urgentTelePhone { get; set; }
+        
+        /// <summary>
+        /// 通讯地址
+        /// </summary>
+        public string postalAddress { get; set; }
+        
+        /// <summary>
+        /// 自我介绍
+        /// </summary>
+        public string signature { get; set; }
+        
+        /// <summary>
+        /// 首次登录时间
+        /// </summary>
+        public DateTime? firstLogTime { get; set; }
+        
+        /// <summary>
+        /// 前次登录时间
+        /// </summary>
+        public DateTime? prevLogTime { get; set; }
+        
+        /// <summary>
+        /// 是否管理员
+        /// </summary>
+        public int? isAdministrator { get; set; }
+        
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string description { get; set; }
+        
+        /// <summary>
+        /// 排序码
+        /// </summary>
+        public long? sortCode { get; set; }
+        
+        /// <summary>
+        /// 主管主键
+        /// </summary>
+        public string managerId { get; set; }
+        
+        /// <summary>
+        /// 组织主键
+        /// </summary>
+        public string organizeId { get; set; }
+        
+        /// <summary>
+        /// 组织名称
+        /// </summary>
+        public string organizeName { get; set; }
+        
+        /// <summary>
+        /// 岗位主键
+        /// </summary>
+        public string positionId { get; set; }
+        
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string positionName { get; set; }
+        
+        /// <summary>
+        /// 角色主键
+        /// </summary>
+        public string roleId { get; set; }
+        
+        /// <summary>
+        /// 角色名称
+        /// </summary>
+        public string roleName { get; set; }
+        
+        /// <summary>
+        /// 门户Id
+        /// </summary>
+        public string portalId { get; set; }
+        
+        /// <summary>
+        /// 扩展字段
+        /// </summary>
+        public string extensionStr { get; set; }
+        
+        /// <summary>
+        /// 微信 OpenId
+        /// </summary>
+        public string openId { get; set; }
+        
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string mdid { get; set; }
+        
+        /// <summary>
+        /// 门店名称
+        /// </summary>
+        public string mdmc { get; set; }
+        
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string zw { get; set; }
+        
+        /// <summary>
+        /// 费用分摊（是/否）
+        /// </summary>
+        public string fyft { get; set; }
+        
+        /// <summary>
+        /// 岗位分类
+        /// </summary>
+        public string gwfl { get; set; }
+        
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string gw { get; set; }
+        
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int? enabledMark { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? creatorTime { get; set; }
+        
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string creatorUserId { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/User/UserListQueryInput.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/User/UserListQueryInput.cs
new file mode 100644
index 0000000..a428573
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/User/UserListQueryInput.cs
@@ -0,0 +1,87 @@
+using NCC.Common.Filter;
+using System.Collections.Generic;
+
+namespace NCC.Extend.Entitys.Dto.User
+{
+    /// <summary>
+    /// 用户列表查询输入参数
+    /// </summary>
+    public class UserListQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 选择导出数据key
+        /// </summary>
+        public string selectKey { get; set; }
+
+        /// <summary>
+        /// 数据类型
+        /// </summary>
+        public int dataType { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 账户
+        /// </summary>
+        public string account { get; set; }
+        
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string realName { get; set; }
+        
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string mobilePhone { get; set; }
+        
+        /// <summary>
+        /// 门店ID
+        /// </summary>
+        public string mdid { get; set; }
+        
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string zw { get; set; }
+        
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string gw { get; set; }
+        
+        /// <summary>
+        /// 岗位分类
+        /// </summary>
+        public string gwfl { get; set; }
+        
+        /// <summary>
+        /// 费用分摊
+        /// </summary>
+        public string fyft { get; set; }
+        
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public string organizeId { get; set; }
+        
+        /// <summary>
+        /// 岗位ID
+        /// </summary>
+        public string positionId { get; set; }
+        
+        /// <summary>
+        /// 角色ID
+        /// </summary>
+        public string roleId { get; set; }
+        
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int? enabledMark { get; set; }
+        
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs
new file mode 100644
index 0000000..60e98d2
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_jinsanjiao_user/LqJinsanjiaoUserEntity.cs
@@ -0,0 +1,86 @@
+using NCC.Common.Const;
+using SqlSugar;
+using System;
+
+namespace NCC.Extend.Entitys.lq_jinsanjiao_user
+{
+    /// <summary>
+    /// 金三角用户绑定关系
+    /// </summary>
+    [SugarTable("lq_jinsanjiao_user")]
+    [Tenant(ClaimConst.TENANT_ID)]
+    public class LqJinsanjiaoUserEntity
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
+        public string Id { get; set; }
+        
+        /// <summary>
+        /// 金三角ID(关联lq_ycsd_jsj.F_Id)
+        /// </summary>
+        [SugarColumn(ColumnName = "jsj_id")]        
+        public string JsjId { get; set; }
+        
+        /// <summary>
+        /// 用户ID(关联BASE_USER.F_Id)
+        /// </summary>
+        [SugarColumn(ColumnName = "user_id")]        
+        public string UserId { get; set; }
+        
+        /// <summary>
+        /// 用户姓名
+        /// </summary>
+        [SugarColumn(ColumnName = "user_name")]        
+        public string UserName { get; set; }
+        
+        /// <summary>
+        /// 是否顾问
+        /// </summary>
+        [SugarColumn(ColumnName = "is_leader")]        
+        public int IsLeader { get; set; }
+        
+        /// <summary>
+        /// 状态(ACTIVE-活跃,INACTIVE-非活跃)
+        /// </summary>
+        [SugarColumn(ColumnName = "status")]        
+        public string Status { get; set; }
+        
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(ColumnName = "sort_order")]        
+        public int SortOrder { get; set; }
+        
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreatorTime")]        
+        public DateTime? CreatorTime { get; set; }
+        
+        /// <summary>
+        /// 创建人ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_CreatorUserId")]        
+        public string CreatorUserId { get; set; }
+        
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        [SugarColumn(ColumnName = "F_LastModifyTime")]        
+        public DateTime? LastModifyTime { get; set; }
+        
+        /// <summary>
+        /// 最后修改人ID
+        /// </summary>
+        [SugarColumn(ColumnName = "F_LastModifyUserId")]        
+        public string LastModifyUserId { get; set; }
+        
+        /// <summary>
+        /// 删除标记
+        /// </summary>
+        [SugarColumn(ColumnName = "F_DeleteMark")]        
+        public int DeleteMark { get; set; }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_mdgs/LqMdMdgsEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_mdgs/LqMdMdgsEntity.cs
deleted file mode 100644
index e7a0da8..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_md_mdgs/LqMdMdgsEntity.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Extend.Entitys.lq_md_mdgs
-{
-    /// <summary>
-    /// 门店归属
-    /// </summary>
-    [SugarTable("lq_md_mdgs")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class LqMdMdgsEntity
-    {
-        /// <summary>
-        /// 门店编码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 单据门店编号
-        /// </summary>
-        [SugarColumn(ColumnName = "djmdbh")]        
-        public string Djmdbh { get; set; }
-        
-        /// <summary>
-        /// 单据门店
-        /// </summary>
-        [SugarColumn(ColumnName = "djmd")]        
-        public string Djmd { get; set; }
-        
-        /// <summary>
-        /// 门店名称
-        /// </summary>
-        [SugarColumn(ColumnName = "mdmc")]        
-        public string Mdmc { get; set; }
-        
-        /// <summary>
-        /// 事业部
-        /// </summary>
-        [SugarColumn(ColumnName = "syb")]        
-        public string Syb { get; set; }
-        
-        /// <summary>
-        /// 教育部
-        /// </summary>
-        [SugarColumn(ColumnName = "jyb")]        
-        public string Jyb { get; set; }
-        
-        /// <summary>
-        /// 科技部
-        /// </summary>
-        [SugarColumn(ColumnName = "kjb")]        
-        public string Kjb { get; set; }
-        
-        /// <summary>
-        /// 大项目部
-        /// </summary>
-        [SugarColumn(ColumnName = "dxmb")]        
-        public string Dxmb { get; set; }
-        
-        /// <summary>
-        /// 归属起始时间
-        /// </summary>
-        [SugarColumn(ColumnName = "gsqssj")]        
-        public DateTime? Gsqssj { get; set; }
-        
-        /// <summary>
-        /// 归属终止时间
-        /// </summary>
-        [SugarColumn(ColumnName = "gszzsj")]        
-        public DateTime? Gszzsj { get; set; }
-        
-        /// <summary>
-        /// 修改信息
-        /// </summary>
-        [SugarColumn(ColumnName = "xgxx")]        
-        public string Xgxx { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
index 1c018a3..a7166ff 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
@@ -101,5 +101,47 @@ namespace NCC.Extend.Entitys.lq_mdxx
         [SugarColumn(ColumnName = "ywsb")]        
         public string Ywsb { get; set; }
         
+        /// <summary>
+        /// 事业部
+        /// </summary>
+        [SugarColumn(ColumnName = "syb")]        
+        public string Syb { get; set; }
+        
+        /// <summary>
+        /// 教育部
+        /// </summary>
+        [SugarColumn(ColumnName = "jyb")]        
+        public string Jyb { get; set; }
+        
+        /// <summary>
+        /// 科技部
+        /// </summary>
+        [SugarColumn(ColumnName = "kjb")]        
+        public string Kjb { get; set; }
+        
+        /// <summary>
+        /// 大项目部
+        /// </summary>
+        [SugarColumn(ColumnName = "dxmb")]        
+        public string Dxmb { get; set; }
+        
+        /// <summary>
+        /// 归属起始时间
+        /// </summary>
+        [SugarColumn(ColumnName = "gsqssj")]        
+        public DateTime? Gsqssj { get; set; }
+        
+        /// <summary>
+        /// 归属终止时间
+        /// </summary>
+        [SugarColumn(ColumnName = "gszzsj")]        
+        public DateTime? Gszzsj { get; set; }
+        
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnName = "status")]        
+        public int? Status { get; set; }
+        
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs
index 26e37d9..8873cb5 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_xmzl/LqXmzlEntity.cs
@@ -101,5 +101,17 @@ namespace NCC.Extend.Entitys.lq_xmzl
         [SugarColumn(ColumnName = "qt2")]        
         public string Qt2 { get; set; }
         
+        /// <summary>
+        /// 溯源金额
+        /// </summary>
+        [SugarColumn(ColumnName = "syje")]        
+        public decimal? Syje { get; set; }
+        
+        /// <summary>
+        /// Cell金额
+        /// </summary>
+        [SugarColumn(ColumnName = "cellje")]        
+        public decimal? Cellje { get; set; }
+        
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs
index dde09de..db50d3f 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_ycsd_jsj/LqYcsdJsjEntity.cs
@@ -24,178 +24,15 @@ namespace NCC.Extend.Entitys.lq_ycsd_jsj
         public string Yf { get; set; }
         
         /// <summary>
-        /// 门店
-        /// </summary>
-        [SugarColumn(ColumnName = "md")]        
-        public string Md { get; set; }
-        
-        /// <summary>
         /// 金三角
         /// </summary>
         [SugarColumn(ColumnName = "jsj")]        
         public string Jsj { get; set; }
         
         /// <summary>
-        /// 岗位
-        /// </summary>
-        [SugarColumn(ColumnName = "gw")]        
-        public string Gw { get; set; }
-        
-        /// <summary>
-        /// 健康师
-        /// </summary>
-        [SugarColumn(ColumnName = "jks")]        
-        public string Jks { get; set; }
-        
-        /// <summary>
-        /// 成交率
-        /// </summary>
-        [SugarColumn(ColumnName = "cjl")]        
-        public decimal Cjl { get; set; }
-        
-        /// <summary>
-        /// 成交业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "cjyj")]        
-        public decimal Cjyj { get; set; }
-        
-        /// <summary>
-        /// 成交提点
-        /// </summary>
-        [SugarColumn(ColumnName = "cjtd")]        
-        public decimal Cjtd { get; set; }
-        
-        /// <summary>
-        /// 剩余业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "syyj")]        
-        public decimal Syyj { get; set; }
-        
-        /// <summary>
-        /// 出勤天数
-        /// </summary>
-        [SugarColumn(ColumnName = "cqts")]        
-        public int? Cqts { get; set; }
-        
-        /// <summary>
-        /// 系统业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "xtyj")]        
-        public decimal Xtyj { get; set; }
-        
-        /// <summary>
-        /// 总业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "zyj")]        
-        public decimal Zyj { get; set; }
-        
-        /// <summary>
-        /// 基础业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "jcyj")]        
-        public decimal Jcyj { get; set; }
-        
-        /// <summary>
-        /// 合作业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "hzyj")]        
-        public decimal Hzyj { get; set; }
-        
-        /// <summary>
-        /// 奖励业绩
-        /// </summary>
-        [SugarColumn(ColumnName = "jlyj")]        
-        public decimal Jlyj { get; set; }
-        
-        /// <summary>
-        /// 项目数
-        /// </summary>
-        [SugarColumn(ColumnName = "xms")]        
-        public int? Xms { get; set; }
-        
-        /// <summary>
-        /// 手工
-        /// </summary>
-        [SugarColumn(ColumnName = "sg")]        
-        public int? Sg { get; set; }
-        
-        /// <summary>
-        /// ①是否属于战队
-        /// </summary>
-        [SugarColumn(ColumnName = "sfsyzd")]        
-        public string Sfsyzd { get; set; }
-        
-        /// <summary>
-        /// ②是否满足考勤
-        /// </summary>
-        [SugarColumn(ColumnName = "fsmzkq")]        
-        public string Fsmzkq { get; set; }
-        
-        /// <summary>
-        /// ③战队最终人数
-        /// </summary>
-        [SugarColumn(ColumnName = "zdzzrs")]        
-        public int? Zdzzrs { get; set; }
-        
-        /// <summary>
-        /// ④考勤后不属于战队视为单人
-        /// </summary>
-        [SugarColumn(ColumnName = "kqhbsyzd")]        
-        public int? Kqhbsyzd { get; set; }
-        
-        /// <summary>
-        /// ⑤战队提成
-        /// </summary>
-        [SugarColumn(ColumnName = "zdtc")]        
-        public decimal Zdtc { get; set; }
-        
-        /// <summary>
-        /// ⑥按1人提成
-        /// </summary>
-        [SugarColumn(ColumnName = "ayrtc")]        
-        public decimal Ayrtc { get; set; }
-        
-        /// <summary>
-        /// 最终提成点
+        /// 门店ID
         /// </summary>
-        [SugarColumn(ColumnName = "zztcd")]        
-        public decimal Zztcd { get; set; }
-        
-        /// <summary>
-        /// 基础业绩提成
-        /// </summary>
-        [SugarColumn(ColumnName = "jcyjtc")]        
-        public decimal Jcyjtc { get; set; }
-        
-        /// <summary>
-        /// 合作业绩提成
-        /// </summary>
-        [SugarColumn(ColumnName = "hzyjtc")]        
-        public decimal Hzyjtc { get; set; }
-        
-        /// <summary>
-        /// 提成合计
-        /// </summary>
-        [SugarColumn(ColumnName = "tchj")]        
-        public decimal Tchj { get; set; }
-        
-        /// <summary>
-        /// 个人占比
-        /// </summary>
-        [SugarColumn(ColumnName = "grzb")]        
-        public decimal Grzb { get; set; }
-        
-        /// <summary>
-        /// 组员合计
-        /// </summary>
-        [SugarColumn(ColumnName = "zyhj")]        
-        public decimal Zyhj { get; set; }
-        
-        /// <summary>
-        /// 顾问提成
-        /// </summary>
-        [SugarColumn(ColumnName = "gwtc")]        
-        public decimal Gwtc { get; set; }
-        
+        [SugarColumn(ColumnName = "md")]        
+        public string Md { get; set; }
     }
 }
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqMdMdgsMapper.cs b/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqMdMdgsMapper.cs
deleted file mode 100644
index 7bcc442..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Mapper/LqMdMdgsMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Extend.Entitys.Dto.LqMdMdgs;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Extend.Entitys.Mapper.LqMdMdgs
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdgsService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdgsService.cs
deleted file mode 100644
index 0449d86..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdgsService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace NCC.Extend.Interfaces.LqMdMdgs
-{
-    public interface ILqMdMdgsService
-    {
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/Organize/IOrganizeService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/Organize/IOrganizeService.cs
new file mode 100644
index 0000000..cd7ee7a
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/Organize/IOrganizeService.cs
@@ -0,0 +1,116 @@
+using NCC.Common.Entity;
+using NCC.Extend.Entitys.Dto.Organize;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace NCC.Extend.Interfaces.Organize
+{
+    /// <summary>
+    /// 组织架构服务接口
+    /// </summary>
+    public interface IOrganizeService
+    {
+        #region 组织架构查询
+
+        /// <summary>
+        /// 获取组织架构列表
+        /// </summary>
+        /// <remarks>
+        /// 根据查询条件获取组织架构列表，支持分页查询
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "fullName": "技术部",
+        ///   "category": "department",
+        ///   "parentId": "ORG001",
+        ///   "currentPage": 1,
+        ///   "pageSize": 20
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - fullName: 组织名称（模糊查询）
+        /// - category: 组织分类（company-公司、department-部门）
+        /// - parentId: 父级组织ID
+        /// - currentPage: 当前页码
+        /// - pageSize: 每页大小
+        /// </remarks>
+        /// <param name="input">查询参数</param>
+        /// <returns>组织架构列表</returns>
+        /// <response code="200">成功返回组织架构列表</response>
+        /// <response code="400">查询参数错误</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<dynamic> GetList(OrganizeListQueryInput input);
+
+        /// <summary>
+        /// 获取组织架构树形结构
+        /// </summary>
+        /// <remarks>
+        /// 获取完整的组织架构树形结构，包含所有子组织
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "parentId": "ORG001"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - parentId: 根节点组织ID（可选，不传则从顶级开始）
+        /// </remarks>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织架构树形结构</returns>
+        /// <response code="200">成功返回组织架构树</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<List<OrganizeTreeOutput>> GetTree(string parentId = null);
+
+        /// <summary>
+        /// 根据组织名称获取该机构下面的所有组织
+        /// </summary>
+        /// <remarks>
+        /// 通过组织名称查找组织，并返回该组织及其所有子组织
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "organizeName": "技术部"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - organizeName: 组织名称（支持模糊查询）
+        /// </remarks>
+        /// <param name="organizeName">组织名称</param>
+        /// <returns>组织及其子组织列表</returns>
+        /// <response code="200">成功返回组织列表</response>
+        /// <response code="400">组织名称不能为空</response>
+        /// <response code="404">未找到指定组织</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<dynamic> GetOrganizationsByName(string organizeName);
+
+        /// <summary>
+        /// 获取组织选择器数据
+        /// </summary>
+        /// <remarks>
+        /// 获取组织选择器所需的数据，用于下拉选择
+        /// 
+        /// 示例请求：
+        /// ```json
+        /// {
+        ///   "parentId": "ORG001"
+        /// }
+        /// ```
+        /// 
+        /// 参数说明：
+        /// - parentId: 父级组织ID（可选）
+        /// </remarks>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织选择器数据</returns>
+        /// <response code="200">成功返回组织选择器数据</response>
+        /// <response code="500">服务器内部错误</response>
+        Task<dynamic> GetSelector(string parentId = null);
+
+        #endregion
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/User/IUserService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/User/IUserService.cs
new file mode 100644
index 0000000..bc9fc61
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/User/IUserService.cs
@@ -0,0 +1,30 @@
+using NCC.Extend.Entitys.Dto.User;
+using System.Threading.Tasks;
+
+namespace NCC.Extend.Interfaces.User
+{
+    /// <summary>
+    /// 用户服务接口
+    /// 提供用户相关的业务操作，包括用户列表查询、用户信息获取、用户选择数据等功能
+    /// 所有接口都确保不返回敏感信息，保证数据安全性
+    /// </summary>
+    public interface IUserService
+    {
+        
+
+        /// <summary>
+        /// 获取用户列表
+        /// </summary>
+        Task<dynamic> GetUserList(UserListQueryInput input);
+
+        /// <summary>
+        /// 获取用户详细信息
+        /// </summary>
+        Task<dynamic> GetUserInfo(string id);
+
+        /// <summary>
+        /// 获取用户下拉选择数据
+        /// </summary>
+        Task<dynamic> GetUserSelector(string mdid = null, string zw = null);
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdgsService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdgsService.cs
deleted file mode 100644
index 628b74a..0000000
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdgsService.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Extend.Interfaces.LqMdMdgs;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Extend.Entitys.lq_md_mdgs;
-using NCC.Extend.Entitys.Dto.LqMdMdgs;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-
-namespace NCC.Extend.LqMdMdgs
-{
-    /// <summary>
-    /// 门店归属服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "Extend",Name = "LqMdMdgs", Order = 200)]
-    [Route("api/Extend/[controller]")]
-    public class LqMdMdgsService : ILqMdMdgsService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<LqMdMdgsEntity> _lqMdMdgsRepository;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="LqMdMdgsService"/>类型的新实例
-        /// </summary>
-        public LqMdMdgsService(
-            ISqlSugarRepository<LqMdMdgsEntity> lqMdMdgsRepository,
-            IUserManager userManager)
-        {
-            _lqMdMdgsRepository = lqMdMdgsRepository;            
-            _db = _lqMdMdgsRepository.Context;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取门店归属
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var entity = await _db.Queryable<LqMdMdgsEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<LqMdMdgsInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-		/// 获取门店归属列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] LqMdMdgsListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryGsqssj = input.gsqssj != null ? input.gsqssj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.First()) : null;
-            DateTime? endGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.Last()) : null;
-            List<string> queryGszzsj = input.gszzsj != null ? input.gszzsj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.First()) : null;
-            DateTime? endGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.Last()) : null;
-            var data = await _db.Queryable<LqMdMdgsEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.djmdbh), p => p.Djmdbh.Contains(input.djmdbh))
-                .WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Contains(input.djmd))
-                .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Equals(input.mdmc))
-                .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb))
-                .WhereIF(!string.IsNullOrEmpty(input.jyb), p => p.Jyb.Equals(input.jyb))
-                .WhereIF(!string.IsNullOrEmpty(input.kjb), p => p.Kjb.Equals(input.kjb))
-                .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj >= new DateTime(startGsqssj.ToDate().Year, startGsqssj.ToDate().Month, startGsqssj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj <= new DateTime(endGsqssj.ToDate().Year, endGsqssj.ToDate().Month, endGsqssj.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj >= new DateTime(startGszzsj.ToDate().Year, startGszzsj.ToDate().Month, startGszzsj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj <= new DateTime(endGszzsj.ToDate().Year, endGszzsj.ToDate().Month, endGszzsj.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.xgxx), p => p.Xgxx.Contains(input.xgxx))
-                .Select(it=> new LqMdMdgsListOutput
-                {
-                    id = it.Id,
-                    djmdbh=it.Djmdbh,
-                    djmd=it.Djmd,
-                    mdmc=it.Mdmc,
-                    syb=it.Syb,
-                    jyb=it.Jyb,
-                    kjb=it.Kjb,
-                    dxmb=it.Dxmb,
-                    gsqssj=it.Gsqssj,
-                    gszzsj=it.Gszzsj,
-                    xgxx=it.Xgxx,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<LqMdMdgsListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建门店归属
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] LqMdMdgsCrInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqMdMdgsEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-		/// 获取门店归属无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] LqMdMdgsListQueryInput input)
-        {
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryGsqssj = input.gsqssj != null ? input.gsqssj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.First()) : null;
-            DateTime? endGsqssj = queryGsqssj != null ? Ext.GetDateTime(queryGsqssj.Last()) : null;
-            List<string> queryGszzsj = input.gszzsj != null ? input.gszzsj.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.First()) : null;
-            DateTime? endGszzsj = queryGszzsj != null ? Ext.GetDateTime(queryGszzsj.Last()) : null;
-            var data = await _db.Queryable<LqMdMdgsEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.id), p => p.Id.Contains(input.id))
-                .WhereIF(!string.IsNullOrEmpty(input.djmdbh), p => p.Djmdbh.Contains(input.djmdbh))
-                .WhereIF(!string.IsNullOrEmpty(input.djmd), p => p.Djmd.Contains(input.djmd))
-                .WhereIF(!string.IsNullOrEmpty(input.mdmc), p => p.Mdmc.Equals(input.mdmc))
-                .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb))
-                .WhereIF(!string.IsNullOrEmpty(input.jyb), p => p.Jyb.Equals(input.jyb))
-                .WhereIF(!string.IsNullOrEmpty(input.kjb), p => p.Kjb.Equals(input.kjb))
-                .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj >= new DateTime(startGsqssj.ToDate().Year, startGsqssj.ToDate().Month, startGsqssj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGsqssj != null, p => p.Gsqssj <= new DateTime(endGsqssj.ToDate().Year, endGsqssj.ToDate().Month, endGsqssj.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj >= new DateTime(startGszzsj.ToDate().Year, startGszzsj.ToDate().Month, startGszzsj.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryGszzsj != null, p => p.Gszzsj <= new DateTime(endGszzsj.ToDate().Year, endGszzsj.ToDate().Month, endGszzsj.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.xgxx), p => p.Xgxx.Contains(input.xgxx))
-                .Select(it=> new LqMdMdgsListOutput
-                {
-                    id = it.Id,
-                    djmdbh=it.Djmdbh,
-                    djmd=it.Djmd,
-                    mdmc=it.Mdmc,
-                    syb=it.Syb,
-                    jyb=it.Jyb,
-                    kjb=it.Kjb,
-                    dxmb=it.Dxmb,
-                    gsqssj=it.Gsqssj,
-                    gszzsj=it.Gszzsj,
-                    xgxx=it.Xgxx,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
-                return data;
-        }
-
-        /// <summary>
-		/// 导出门店归属
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] LqMdMdgsListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<LqMdMdgsListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<LqMdMdgsListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"门店编码\",\"field\":\"id\"},{\"value\":\"单据门店编号\",\"field\":\"djmdbh\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"事业部\",\"field\":\"syb\"},{\"value\":\"教育部\",\"field\":\"jyb\"},{\"value\":\"科技部\",\"field\":\"kjb\"},{\"value\":\"大项目部\",\"field\":\"dxmb\"},{\"value\":\"归属起始时间\",\"field\":\"gsqssj\"},{\"value\":\"归属终止时间\",\"field\":\"gszzsj\"},{\"value\":\"修改信息\",\"field\":\"xgxx\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},]".ToList<ParamsModel>();           
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "门店归属.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<LqMdMdgsListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 批量删除门店归属
-        /// </summary>
-        /// <param name="ids">主键数组</param>
-        /// <returns></returns>
-        [HttpPost("batchRemove")]
-        public async Task BatchRemove([FromBody] List<string> ids)
-        {
-            var entitys = await _db.Queryable<LqMdMdgsEntity>().In(it => it.Id, ids).ToListAsync();
-            if (entitys.Count > 0)
-            {
-                try
-                {
-                    //开启事务
-                    _db.BeginTran();
-                    //批量删除门店归属
-                    await _db.Deleteable<LqMdMdgsEntity>().In(d => d.Id,ids).ExecuteCommandAsync();
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh(ErrorCode.COM1002);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 更新门店归属
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] LqMdMdgsUpInput input)
-        {
-            var entity = input.Adapt<LqMdMdgsEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除门店归属
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var entity = await _db.Queryable<LqMdMdgsEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<LqMdMdgsEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
index 0918bda..808858b 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
@@ -107,6 +107,10 @@ namespace NCC.Extend.LqMdxx
                     gsmc=it.Gsmc,
                     fr=it.Fr,
                     ywsb=it.Ywsb,
+                    jyb=it.Jyb,
+                    kjb=it.Kjb,
+                    dxmb=it.Dxmb,
+                    syb=it.Syb,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
         }
@@ -261,6 +265,7 @@ namespace NCC.Extend.LqMdxx
         public async Task Update(string id, [FromBody] LqMdxxUpInput input)
         {
             var entity = input.Adapt<LqMdxxEntity>();
+            entity.Id = id; // 设置主键ID
             var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
         }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
index b753f22..f31e495 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqXmzlService.cs
@@ -86,6 +86,8 @@ namespace NCC.Extend.LqXmzl
                 .WhereIF(!string.IsNullOrEmpty(input.fl), p => p.Fl.Contains(input.fl))
                 .WhereIF(!string.IsNullOrEmpty(input.qt1), p => p.Qt1.Contains(input.qt1))
                 .WhereIF(!string.IsNullOrEmpty(input.qt2), p => p.Qt2.Contains(input.qt2))
+                .WhereIF(!string.IsNullOrEmpty(input.syje), p => p.Syje.Equals(input.syje))
+                .WhereIF(!string.IsNullOrEmpty(input.cellje), p => p.Cellje.Equals(input.cellje))
                 .Select(it=> new LqXmzlListOutput
                 {
                     id = it.Id,
@@ -103,6 +105,8 @@ namespace NCC.Extend.LqXmzl
                     fl=it.Fl,
                     qt1=it.Qt1,
                     qt2=it.Qt2,
+                    syje=it.Syje,
+                    cellje=it.Cellje,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<LqXmzlListOutput>.SqlSugarPageResult(data);
         }
@@ -147,6 +151,8 @@ namespace NCC.Extend.LqXmzl
                 .WhereIF(!string.IsNullOrEmpty(input.fl), p => p.Fl.Contains(input.fl))
                 .WhereIF(!string.IsNullOrEmpty(input.qt1), p => p.Qt1.Contains(input.qt1))
                 .WhereIF(!string.IsNullOrEmpty(input.qt2), p => p.Qt2.Contains(input.qt2))
+                .WhereIF(!string.IsNullOrEmpty(input.syje), p => p.Syje.Equals(input.syje))
+                .WhereIF(!string.IsNullOrEmpty(input.cellje), p => p.Cellje.Equals(input.cellje))
                 .Select(it=> new LqXmzlListOutput
                 {
                     id = it.Id,
@@ -164,6 +170,8 @@ namespace NCC.Extend.LqXmzl
                     fl=it.Fl,
                     qt1=it.Qt1,
                     qt2=it.Qt2,
+                    syje=it.Syje,
+                    cellje=it.Cellje,
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
                 return data;
         }
@@ -187,7 +195,7 @@ namespace NCC.Extend.LqXmzl
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"项目编号\",\"field\":\"xmbh\"},{\"value\":\"项目名称\",\"field\":\"xmmc\"},{\"value\":\"标准价格\",\"field\":\"bzjg\"},{\"value\":\"时长（分）\",\"field\":\"xmsc\"},{\"value\":\"基础服务提成\",\"field\":\"jcfwtc\"},{\"value\":\"分类1汇总表\",\"field\":\"fl1\"},{\"value\":\"分类2汇总表\",\"field\":\"fl2\"},{\"value\":\"分类3工资用\",\"field\":\"fl3\"},{\"value\":\"分类4品项用\",\"field\":\"fl4\"},{\"value\":\"统计类别\",\"field\":\"tjlb\"},{\"value\":\"折扣类别\",\"field\":\"zklb\"},{\"value\":\"分类\",\"field\":\"fl\"},{\"value\":\"其它1\",\"field\":\"qt1\"},{\"value\":\"其它2\",\"field\":\"qt2\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"项目编号\",\"field\":\"xmbh\"},{\"value\":\"项目名称\",\"field\":\"xmmc\"},{\"value\":\"标准价格\",\"field\":\"bzjg\"},{\"value\":\"时长（分）\",\"field\":\"xmsc\"},{\"value\":\"基础服务提成\",\"field\":\"jcfwtc\"},{\"value\":\"分类1汇总表\",\"field\":\"fl1\"},{\"value\":\"分类2汇总表\",\"field\":\"fl2\"},{\"value\":\"分类3工资用\",\"field\":\"fl3\"},{\"value\":\"分类4品项用\",\"field\":\"fl4\"},{\"value\":\"统计类别\",\"field\":\"tjlb\"},{\"value\":\"折扣类别\",\"field\":\"zklb\"},{\"value\":\"分类\",\"field\":\"fl\"},{\"value\":\"其它1\",\"field\":\"qt1\"},{\"value\":\"其它2\",\"field\":\"qt2\"},{\"value\":\"溯源金额\",\"field\":\"syje\"},{\"value\":\"Cell金额\",\"field\":\"cellje\"},]".ToList<ParamsModel>();           
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "项目资料.xls";
             excelconfig.HeadFont = "微软雅黑";
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
index 229b3bb..0b19014 100644
--- a/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
+++ b/netcore/src/Modularity/Extend/NCC.Extend/LqYcsdJsjService.cs
@@ -11,9 +11,12 @@ using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using NCC.Extend.Entitys.lq_ycsd_jsj;
+using NCC.Extend.Entitys.lq_jinsanjiao_user;
+using NCC.Extend.Entitys.lq_mdxx;
 using NCC.Extend.Entitys.Dto.LqYcsdJsj;
 using Yitter.IdGenerator;
 using NCC.Common.Helper;
@@ -62,6 +65,41 @@ namespace NCC.Extend.LqYcsdJsj
         }
 
         /// <summary>
+        /// 获取金三角设定详情（包含成员信息）
+        /// </summary>
+        /// <param name="id">金三角ID</param>
+        /// <returns></returns>
+        [HttpGet("{id}/detail")]
+        public async Task<dynamic> GetDetail(string id)
+        {
+            var entity = await _db.Queryable<LqYcsdJsjEntity>().FirstAsync(p => p.Id == id);
+            if (entity == null) throw NCCException.Oh(ErrorCode.COM1005);
+            
+            var output = entity.Adapt<LqYcsdJsjInfoOutput>();
+            
+            // 获取成员信息
+            var members = await _db.Queryable<LqJinsanjiaoUserEntity>()
+                .Where(x => x.JsjId == id && x.Status == "ACTIVE")
+                .OrderBy(x => x.SortOrder)
+                .Select(x => new
+                {
+                    id = x.Id,
+                    userId = x.UserId,
+                    userName = x.UserName,
+                    isLeader = x.IsLeader,
+                    sortOrder = x.SortOrder,
+                    status = x.Status
+                })
+                .ToListAsync();
+            
+            return new
+            {
+                jsj = output,
+                members = members
+            };
+        }
+
+        /// <summary>
 		/// 获取金三角设定列表
 		/// </summary>
 		/// <param name="input">请求参数</param>
@@ -75,72 +113,18 @@ namespace NCC.Extend.LqYcsdJsj
                 .WhereIF(!string.IsNullOrEmpty(input.yf), p => p.Yf.Contains(input.yf))
                 .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Contains(input.md))
                 .WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Contains(input.jsj))
-                .WhereIF(!string.IsNullOrEmpty(input.gw), p => p.Gw.Contains(input.gw))
-                .WhereIF(!string.IsNullOrEmpty(input.jks), p => p.Jks.Contains(input.jks))
-                .WhereIF(!string.IsNullOrEmpty(input.cjl), p => p.Cjl.Equals(input.cjl))
-                .WhereIF(!string.IsNullOrEmpty(input.cjyj), p => p.Cjyj.Equals(input.cjyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cjtd), p => p.Cjtd.Equals(input.cjtd))
-                .WhereIF(!string.IsNullOrEmpty(input.syyj), p => p.Syyj.Equals(input.syyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cqts), p => p.Cqts.Equals(input.cqts))
-                .WhereIF(!string.IsNullOrEmpty(input.xtyj), p => p.Xtyj.Equals(input.xtyj))
-                .WhereIF(!string.IsNullOrEmpty(input.zyj), p => p.Zyj.Equals(input.zyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyj), p => p.Jcyj.Equals(input.jcyj))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyj), p => p.Hzyj.Equals(input.hzyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jlyj), p => p.Jlyj.Equals(input.jlyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Equals(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Equals(input.sg))
-                .WhereIF(!string.IsNullOrEmpty(input.sfsyzd), p => p.Sfsyzd.Contains(input.sfsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.fsmzkq), p => p.Fsmzkq.Contains(input.fsmzkq))
-                .WhereIF(!string.IsNullOrEmpty(input.zdzzrs), p => p.Zdzzrs.Equals(input.zdzzrs))
-                .WhereIF(!string.IsNullOrEmpty(input.kqhbsyzd), p => p.Kqhbsyzd.Equals(input.kqhbsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.zdtc), p => p.Zdtc.Equals(input.zdtc))
-                .WhereIF(!string.IsNullOrEmpty(input.ayrtc), p => p.Ayrtc.Equals(input.ayrtc))
-                .WhereIF(!string.IsNullOrEmpty(input.zztcd), p => p.Zztcd.Equals(input.zztcd))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyjtc), p => p.Jcyjtc.Equals(input.jcyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyjtc), p => p.Hzyjtc.Equals(input.hzyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.tchj), p => p.Tchj.Equals(input.tchj))
-                .WhereIF(!string.IsNullOrEmpty(input.grzb), p => p.Grzb.Equals(input.grzb))
-                .WhereIF(!string.IsNullOrEmpty(input.zyhj), p => p.Zyhj.Equals(input.zyhj))
-                .WhereIF(!string.IsNullOrEmpty(input.gwtc), p => p.Gwtc.Equals(input.gwtc))
                 .Select(it=> new LqYcsdJsjListOutput
                 {
                     id = it.Id,
-                    yf=it.Yf,
-                    md=it.Md,
-                    jsj=it.Jsj,
-                    gw=it.Gw,
-                    jks=it.Jks,
-                    cjl=it.Cjl,
-                    cjyj=it.Cjyj,
-                    cjtd=it.Cjtd,
-                    syyj=it.Syyj,
-                    cqts=it.Cqts,
-                    xtyj=it.Xtyj,
-                    zyj=it.Zyj,
-                    jcyj=it.Jcyj,
-                    hzyj=it.Hzyj,
-                    jlyj=it.Jlyj,
-                    xms=it.Xms,
-                    sg=it.Sg,
-                    sfsyzd=it.Sfsyzd,
-                    fsmzkq=it.Fsmzkq,
-                    zdzzrs=it.Zdzzrs,
-                    kqhbsyzd=it.Kqhbsyzd,
-                    zdtc=it.Zdtc,
-                    ayrtc=it.Ayrtc,
-                    zztcd=it.Zztcd,
-                    jcyjtc=it.Jcyjtc,
-                    hzyjtc=it.Hzyjtc,
-                    tchj=it.Tchj,
-                    grzb=it.Grzb,
-                    zyhj=it.Zyhj,
-                    gwtc=it.Gwtc,
+                    yf = it.Yf,
+                    md = it.Md,
+                    jsj = it.Jsj
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
                 return PageResult<LqYcsdJsjListOutput>.SqlSugarPageResult(data);
         }
 
         /// <summary>
-        /// 新建金三角设定
+        /// 新建金三角
         /// </summary>
         /// <param name="input">参数</param>
         /// <returns></returns>
@@ -148,10 +132,69 @@ namespace NCC.Extend.LqYcsdJsj
         public async Task Create([FromBody] LqYcsdJsjCrInput input)
         {
             var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<LqYcsdJsjEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
+            
+            // 参数验证
+            if (string.IsNullOrEmpty(input.yf))
+                throw NCCException.Oh(ErrorCode.COM1000, "月份不能为空");
+            if (string.IsNullOrEmpty(input.md))
+                throw NCCException.Oh(ErrorCode.COM1000, "门店不能为空");
+            if (string.IsNullOrEmpty(input.jsj))
+                throw NCCException.Oh(ErrorCode.COM1000, "金三角名称不能为空");
+            
+            // 验证月份格式
+            if (!DateTime.TryParseExact(input.yf, "yyyyMM", null, DateTimeStyles.None, out _))
+            {
+                throw NCCException.Oh(ErrorCode.COM1000, "月份格式必须为yyyyMM");
+            }
+            
+            // 验证多人战队必须有顾问
+            if (input.members != null && input.members.Count >= 2)
+            {
+                var hasLeader = input.members.Any(m => m.isLeader == 1);
+                if (!hasLeader)
+                {
+                    throw NCCException.Oh(ErrorCode.COM1000, "两人或两人以上的战队必须有一个顾问");
+                }
+            }
+            
+            // 验证金三角名称是否已存在
+            var existingJsj = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == input.yf && x.Md == input.md && x.Jsj == input.jsj)
+                .FirstAsync();
+            if (existingJsj != null)
+            {
+                throw NCCException.Oh(ErrorCode.COM1000, "该门店该月份已存在同名金三角");
+            }
+            try
+            {
+                // 开启事务
+                _db.BeginTran();
+                // 1. 创建门店T区（如果不存在）
+                await CreateOrUpdateStoreTArea(input.yf, input.md, userInfo.userId);
+                // 2. 创建金三角基础信息
+                var entity = input.Adapt<LqYcsdJsjEntity>();
+                entity.Id = YitIdHelper.NextId().ToString();
+                var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
+                if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
+                // 3. 创建金三角成员绑定关系
+                if (input.members != null && input.members.Count > 0)
+                {
+                    await CreateJsjMembers(entity.Id, input.members, userInfo.userId);
+                }
+                // 4. 创建站点战队T区（如果金三角不是T区）
+                if (!input.jsj.EndsWith("T区"))
+                {
+                    await CreateOrUpdateTeamTArea(input.yf, input.jsj, input.md, userInfo.userId);
+                }
+                // 提交事务
+                _db.CommitTran();
+            }
+            catch (Exception ex)
+            {
+                // 回滚事务
+                _db.RollbackTran();
+                throw NCCException.Oh(ErrorCode.COM1000, ex.Message);
+            }
         }
 
         /// <summary>
@@ -168,66 +211,12 @@ namespace NCC.Extend.LqYcsdJsj
                 .WhereIF(!string.IsNullOrEmpty(input.yf), p => p.Yf.Contains(input.yf))
                 .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Contains(input.md))
                 .WhereIF(!string.IsNullOrEmpty(input.jsj), p => p.Jsj.Contains(input.jsj))
-                .WhereIF(!string.IsNullOrEmpty(input.gw), p => p.Gw.Contains(input.gw))
-                .WhereIF(!string.IsNullOrEmpty(input.jks), p => p.Jks.Contains(input.jks))
-                .WhereIF(!string.IsNullOrEmpty(input.cjl), p => p.Cjl.Equals(input.cjl))
-                .WhereIF(!string.IsNullOrEmpty(input.cjyj), p => p.Cjyj.Equals(input.cjyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cjtd), p => p.Cjtd.Equals(input.cjtd))
-                .WhereIF(!string.IsNullOrEmpty(input.syyj), p => p.Syyj.Equals(input.syyj))
-                .WhereIF(!string.IsNullOrEmpty(input.cqts), p => p.Cqts.Equals(input.cqts))
-                .WhereIF(!string.IsNullOrEmpty(input.xtyj), p => p.Xtyj.Equals(input.xtyj))
-                .WhereIF(!string.IsNullOrEmpty(input.zyj), p => p.Zyj.Equals(input.zyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyj), p => p.Jcyj.Equals(input.jcyj))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyj), p => p.Hzyj.Equals(input.hzyj))
-                .WhereIF(!string.IsNullOrEmpty(input.jlyj), p => p.Jlyj.Equals(input.jlyj))
-                .WhereIF(!string.IsNullOrEmpty(input.xms), p => p.Xms.Equals(input.xms))
-                .WhereIF(!string.IsNullOrEmpty(input.sg), p => p.Sg.Equals(input.sg))
-                .WhereIF(!string.IsNullOrEmpty(input.sfsyzd), p => p.Sfsyzd.Contains(input.sfsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.fsmzkq), p => p.Fsmzkq.Contains(input.fsmzkq))
-                .WhereIF(!string.IsNullOrEmpty(input.zdzzrs), p => p.Zdzzrs.Equals(input.zdzzrs))
-                .WhereIF(!string.IsNullOrEmpty(input.kqhbsyzd), p => p.Kqhbsyzd.Equals(input.kqhbsyzd))
-                .WhereIF(!string.IsNullOrEmpty(input.zdtc), p => p.Zdtc.Equals(input.zdtc))
-                .WhereIF(!string.IsNullOrEmpty(input.ayrtc), p => p.Ayrtc.Equals(input.ayrtc))
-                .WhereIF(!string.IsNullOrEmpty(input.zztcd), p => p.Zztcd.Equals(input.zztcd))
-                .WhereIF(!string.IsNullOrEmpty(input.jcyjtc), p => p.Jcyjtc.Equals(input.jcyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.hzyjtc), p => p.Hzyjtc.Equals(input.hzyjtc))
-                .WhereIF(!string.IsNullOrEmpty(input.tchj), p => p.Tchj.Equals(input.tchj))
-                .WhereIF(!string.IsNullOrEmpty(input.grzb), p => p.Grzb.Equals(input.grzb))
-                .WhereIF(!string.IsNullOrEmpty(input.zyhj), p => p.Zyhj.Equals(input.zyhj))
-                .WhereIF(!string.IsNullOrEmpty(input.gwtc), p => p.Gwtc.Equals(input.gwtc))
                 .Select(it=> new LqYcsdJsjListOutput
                 {
                     id = it.Id,
-                    yf=it.Yf,
-                    md=it.Md,
-                    jsj=it.Jsj,
-                    gw=it.Gw,
-                    jks=it.Jks,
-                    cjl=it.Cjl,
-                    cjyj=it.Cjyj,
-                    cjtd=it.Cjtd,
-                    syyj=it.Syyj,
-                    cqts=it.Cqts,
-                    xtyj=it.Xtyj,
-                    zyj=it.Zyj,
-                    jcyj=it.Jcyj,
-                    hzyj=it.Hzyj,
-                    jlyj=it.Jlyj,
-                    xms=it.Xms,
-                    sg=it.Sg,
-                    sfsyzd=it.Sfsyzd,
-                    fsmzkq=it.Fsmzkq,
-                    zdzzrs=it.Zdzzrs,
-                    kqhbsyzd=it.Kqhbsyzd,
-                    zdtc=it.Zdtc,
-                    ayrtc=it.Ayrtc,
-                    zztcd=it.Zztcd,
-                    jcyjtc=it.Jcyjtc,
-                    hzyjtc=it.Hzyjtc,
-                    tchj=it.Tchj,
-                    grzb=it.Grzb,
-                    zyhj=it.Zyhj,
-                    gwtc=it.Gwtc,
+                    yf = it.Yf,
+                    md = it.Md,
+                    jsj = it.Jsj
                 }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync();
                 return data;
         }
@@ -251,7 +240,7 @@ namespace NCC.Extend.LqYcsdJsj
             {
                 exportData = await this.GetNoPagingList(input);
             }
-            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"月份\",\"field\":\"yf\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"金三角\",\"field\":\"jsj\"},{\"value\":\"岗位\",\"field\":\"gw\"},{\"value\":\"健康师\",\"field\":\"jks\"},{\"value\":\"成交率\",\"field\":\"cjl\"},{\"value\":\"成交业绩\",\"field\":\"cjyj\"},{\"value\":\"成交提点\",\"field\":\"cjtd\"},{\"value\":\"剩余业绩\",\"field\":\"syyj\"},{\"value\":\"出勤天数\",\"field\":\"cqts\"},{\"value\":\"系统业绩\",\"field\":\"xtyj\"},{\"value\":\"总业绩\",\"field\":\"zyj\"},{\"value\":\"基础业绩\",\"field\":\"jcyj\"},{\"value\":\"合作业绩\",\"field\":\"hzyj\"},{\"value\":\"奖励业绩\",\"field\":\"jlyj\"},{\"value\":\"项目数\",\"field\":\"xms\"},{\"value\":\"手工\",\"field\":\"sg\"},{\"value\":\"是否属于战队\",\"field\":\"sfsyzd\"},{\"value\":\"是否满足考勤\",\"field\":\"fsmzkq\"},{\"value\":\"战队最终人数\",\"field\":\"zdzzrs\"},{\"value\":\"视为单人\",\"field\":\"kqhbsyzd\"},{\"value\":\"战队提成\",\"field\":\"zdtc\"},{\"value\":\"按1人提成\",\"field\":\"ayrtc\"},{\"value\":\"最终提成点\",\"field\":\"zztcd\"},{\"value\":\"基础业绩提成\",\"field\":\"jcyjtc\"},{\"value\":\"合作业绩提成\",\"field\":\"hzyjtc\"},{\"value\":\"提成合计\",\"field\":\"tchj\"},{\"value\":\"个人占比\",\"field\":\"grzb\"},{\"value\":\"组员合计\",\"field\":\"zyhj\"},{\"value\":\"顾问提成\",\"field\":\"gwtc\"},]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"月份\",\"field\":\"yf\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"金三角\",\"field\":\"jsj\"}]".ToList<ParamsModel>();           
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "金三角设定.xls";
             excelconfig.HeadFont = "微软雅黑";
@@ -333,5 +322,132 @@ namespace NCC.Extend.LqYcsdJsj
             var isOk = await _db.Deleteable<LqYcsdJsjEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
             if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
         }
+
+        #region 私有辅助方法
+
+        /// <summary>
+        /// 创建或更新门店T区
+        /// </summary>
+        /// <param name="yf">月份</param>
+        /// <param name="mdId">门店ID</param>
+        /// <param name="creatorUserId">创建人ID</param>
+        /// <returns></returns>
+        private async Task CreateOrUpdateStoreTArea(string yf, string mdId, string creatorUserId)
+        {
+            // 获取门店名称
+            var storeName = await GetStoreNameById(mdId);
+            var tAreaName = $"{storeName}T区";
+            
+            // 检查该门店该月份是否已有T区
+            var existingTArea = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == yf && x.Md == mdId && x.Jsj == tAreaName)
+                .FirstAsync();
+            
+            if (existingTArea == null)
+            {
+                // 创建门店T区
+                var tAreaEntity = new LqYcsdJsjEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    Yf = yf,
+                    Md = mdId,
+                    Jsj = tAreaName
+                };
+                
+                await _db.Insertable(tAreaEntity).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 创建或更新战队T区
+        /// </summary>
+        /// <param name="yf">月份</param>
+        /// <param name="teamName">战队名称</param>
+        /// <param name="mdId">门店ID</param>
+        /// <param name="creatorUserId">创建人ID</param>
+        /// <returns></returns>
+        private async Task CreateOrUpdateTeamTArea(string yf, string teamName, string mdId, string creatorUserId)
+        {
+            var tAreaName = $"{teamName}T区";
+            
+            // 检查该战队该月份是否已有T区
+            var existingTArea = await _db.Queryable<LqYcsdJsjEntity>()
+                .Where(x => x.Yf == yf && x.Md == mdId && x.Jsj == tAreaName)
+                .FirstAsync();
+            
+            if (existingTArea == null)
+            {
+                // 创建战队T区
+                var tAreaEntity = new LqYcsdJsjEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    Yf = yf,
+                    Md = mdId,
+                    Jsj = tAreaName
+                };
+                
+                await _db.Insertable(tAreaEntity).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 创建金三角成员绑定关系
+        /// </summary>
+        /// <param name="jsjId">金三角ID</param>
+        /// <param name="members">成员列表</param>
+        /// <param name="creatorUserId">创建人ID</param>
+        /// <returns></returns>
+        private async Task CreateJsjMembers(string jsjId, List<JsjMemberInput> members, string creatorUserId)
+        {
+            var memberEntities = new List<LqJinsanjiaoUserEntity>();
+            
+            for (int i = 0; i < members.Count; i++)
+            {
+                var member = members[i];
+                var memberEntity = new LqJinsanjiaoUserEntity
+                {
+                    Id = YitIdHelper.NextId().ToString(),
+                    JsjId = jsjId,
+                    UserId = member.userId,
+                    UserName = member.userName,
+                    IsLeader = member.isLeader,
+                    Status = "ACTIVE",
+                    SortOrder = member.sortOrder > 0 ? member.sortOrder : i + 1,
+                    CreatorTime = DateTime.Now,
+                    CreatorUserId = creatorUserId,
+                    DeleteMark = 0
+                };
+                
+                memberEntities.Add(memberEntity);
+            }
+            
+            if (memberEntities.Count > 0)
+            {
+                await _db.Insertable(memberEntities).ExecuteCommandAsync();
+            }
+        }
+
+        /// <summary>
+        /// 根据门店ID获取门店名称
+        /// </summary>
+        /// <param name="mdId">门店ID</param>
+        /// <returns></returns>
+        private async Task<string> GetStoreNameById(string mdId)
+        {
+            try
+            {
+                var storeName = await _db.Queryable<LqMdxxEntity>()
+                    .Where(x => x.Id == mdId)
+                    .Select(x => x.Dm)
+                    .FirstAsync();
+                return string.IsNullOrEmpty(storeName) ? "未知门店" : storeName;
+            }
+            catch
+            {
+                return "未知门店";
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/OrganizeService.cs b/netcore/src/Modularity/Extend/NCC.Extend/OrganizeService.cs
new file mode 100644
index 0000000..99e6008
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend/OrganizeService.cs
@@ -0,0 +1,299 @@
+using NCC.Common.Entity;
+using NCC.Extend.Entitys.Dto.Organize;
+using NCC.Extend.Interfaces.Organize;
+using NCC.System.Entitys.Permission;
+using NCC.Dependency;
+using NCC.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace NCC.Extend
+{
+    /// <summary>
+    /// 组织架构服务实现
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "绿纤组织架构服务", Name = "Organize", Order = 201)]
+    [Route("api/Extend/[controller]")]
+    public class OrganizeService : IOrganizeService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarClient _db;
+
+        /// <summary>
+        /// 初始化组织架构服务
+        /// </summary>
+        /// <param name="db">数据库客户端</param>
+        public OrganizeService(ISqlSugarClient db)
+        {
+            _db = db;
+        }
+
+        #region 组织架构查询
+
+        /// <summary>
+        /// 获取组织架构列表
+        /// </summary>
+        /// <param name="input">查询参数</param>
+        /// <returns>组织架构列表</returns>
+        [HttpGet("")]
+        public async Task<dynamic> GetList([FromQuery] OrganizeListQueryInput input)
+        {
+            var query = _db.Queryable<OrganizeEntity>()
+                .WhereIF(!string.IsNullOrEmpty(input.FullName), x => x.FullName.Contains(input.FullName))
+                .WhereIF(!string.IsNullOrEmpty(input.EnCode), x => x.EnCode.Contains(input.EnCode))
+                .WhereIF(!string.IsNullOrEmpty(input.Category), x => x.Category == input.Category)
+                .WhereIF(!string.IsNullOrEmpty(input.ParentId), x => x.ParentId == input.ParentId)
+                .WhereIF(input.EnabledMark.HasValue, x => x.EnabledMark == input.EnabledMark)
+                .Where(x => x.DeleteMark == null)
+                .OrderBy(x => x.SortCode, OrderByType.Asc)
+                .OrderBy(x => x.CreatorTime, OrderByType.Desc);
+
+            var total = await query.CountAsync();
+            var list = await query
+                .Select(x => new OrganizeListOutput
+                {
+                    Id = x.Id,
+                    FullName = x.FullName,
+                    EnCode = x.EnCode,
+                    Category = x.Category,
+                    ParentId = x.ParentId,
+                    ManagerId = x.ManagerId,
+                    Description = x.Description,
+                    SortCode = x.SortCode,
+                    EnabledMark = x.EnabledMark,
+                    CreatorTime = x.CreatorTime
+                })
+                .ToPagedListAsync(input.currentPage, input.pageSize);
+
+            // 获取父级组织名称和主管姓名
+            var parentIds = list.list.Where(x => !string.IsNullOrEmpty(x.ParentId)).Select(x => x.ParentId).Distinct().ToList();
+            var managerIds = list.list.Where(x => !string.IsNullOrEmpty(x.ManagerId)).Select(x => x.ManagerId).Distinct().ToList();
+
+            var parentMap = new Dictionary<string, string>();
+            var managerMap = new Dictionary<string, string>();
+
+            if (parentIds.Any())
+            {
+                var parents = await _db.Queryable<OrganizeEntity>()
+                    .Where(x => parentIds.Contains(x.Id))
+                    .Select(x => new { x.Id, x.FullName })
+                    .ToListAsync();
+                parentMap = parents.ToDictionary(x => x.Id, x => x.FullName);
+            }
+
+            if (managerIds.Any())
+            {
+                var managers = await _db.Queryable<UserEntity>()
+                    .Where(x => managerIds.Contains(x.Id))
+                    .Select(x => new { x.Id, x.RealName })
+                    .ToListAsync();
+                managerMap = managers.ToDictionary(x => x.Id, x => x.RealName);
+            }
+
+            // 填充父级组织名称和主管姓名
+            foreach (var item in list.list)
+            {
+                if (!string.IsNullOrEmpty(item.ParentId) && parentMap.ContainsKey(item.ParentId))
+                {
+                    item.ParentName = parentMap[item.ParentId];
+                }
+
+                if (!string.IsNullOrEmpty(item.ManagerId) && managerMap.ContainsKey(item.ManagerId))
+                {
+                    item.ManagerName = managerMap[item.ManagerId];
+                }
+
+                // 获取子组织数量
+                item.ChildrenCount = await _db.Queryable<OrganizeEntity>()
+                    .Where(x => x.ParentId == item.Id && x.DeleteMark == null)
+                    .CountAsync();
+            }
+
+            return new { list = list.list, total };
+        }
+
+        /// <summary>
+        /// 获取组织架构树形结构
+        /// </summary>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织架构树形结构</returns>
+        [HttpGet("Tree")]
+        public async Task<List<OrganizeTreeOutput>> GetTree([FromQuery] string parentId = null)
+        {
+            var query = _db.Queryable<OrganizeEntity>()
+                .Where(x => x.DeleteMark == null)
+                .WhereIF(!string.IsNullOrEmpty(parentId), x => x.ParentId == parentId)
+                .WhereIF(string.IsNullOrEmpty(parentId), x => string.IsNullOrEmpty(x.ParentId))
+                .OrderBy(x => x.SortCode, OrderByType.Asc)
+                .OrderBy(x => x.CreatorTime, OrderByType.Desc);
+
+            var list = await query
+                .Select(x => new OrganizeTreeOutput
+                {
+                    Id = x.Id,
+                    FullName = x.FullName,
+                    EnCode = x.EnCode,
+                    Category = x.Category,
+                    ParentId = x.ParentId,
+                    ManagerId = x.ManagerId,
+                    Description = x.Description,
+                    SortCode = x.SortCode,
+                    EnabledMark = x.EnabledMark
+                })
+                .ToListAsync();
+
+
+            // 构建树形结构
+            return BuildTree(list, parentId);
+        }
+
+        /// <summary>
+        /// 根据组织名称获取该机构下面的所有组织
+        /// </summary>
+        /// <param name="organizeName">组织名称</param>
+        /// <returns>组织及其子组织列表</returns>
+        [HttpGet("GetByName")]
+        public async Task<dynamic> GetOrganizationsByName([FromQuery] string organizeName)
+        {
+            if (string.IsNullOrEmpty(organizeName))
+            {
+                throw new ArgumentException("组织名称不能为空", nameof(organizeName));
+            }
+
+            // 查找匹配的组织
+            var matchedOrganizes = await _db.Queryable<OrganizeEntity>().Where(x => x.FullName == organizeName && x.DeleteMark == null).FirstAsync();
+            if (matchedOrganizes == null)
+            {
+                throw new ArgumentException("未找到指定组织", nameof(organizeName));
+            }
+            var result = await _db.Queryable<OrganizeEntity>().Where(x => x.ParentId == matchedOrganizes.Id && x.DeleteMark == null).Select(x => new OrganizeTreeOutput
+            {
+                Id = x.Id,
+                FullName = x.FullName,
+                EnCode = x.EnCode,
+                Category = x.Category,
+            }).ToListAsync();
+            return result;
+        }
+
+        /// <summary>
+        /// 获取组织选择器数据
+        /// </summary>
+        /// <param name="parentId">父级组织ID（可选）</param>
+        /// <returns>组织选择器数据</returns>
+        [HttpGet("Selector")]
+        public async Task<dynamic> GetSelector([FromQuery] string parentId = null)
+        {
+            var query = _db.Queryable<OrganizeEntity>()
+                .Where(x => x.DeleteMark == null && x.EnabledMark == 1)
+                .WhereIF(!string.IsNullOrEmpty(parentId), x => x.ParentId == parentId)
+                .WhereIF(string.IsNullOrEmpty(parentId), x => string.IsNullOrEmpty(x.ParentId))
+                .OrderBy(x => x.SortCode, OrderByType.Asc)
+                .OrderBy(x => x.CreatorTime, OrderByType.Desc);
+
+            var list = await query
+                .Select(x => new
+                {
+                    id = x.Id,
+                    fullName = x.FullName,
+                    enCode = x.EnCode,
+                    category = x.Category,
+                    parentId = x.ParentId
+                })
+                .ToListAsync();
+
+            return new { list };
+        }
+
+        #endregion
+
+        #region 私有方法
+
+        /// <summary>
+        /// 构建树形结构
+        /// </summary>
+        /// <param name="list">组织列表</param>
+        /// <param name="parentId">父级ID</param>
+        /// <returns>树形结构</returns>
+        private List<OrganizeTreeOutput> BuildTree(List<OrganizeTreeOutput> list, string parentId)
+        {
+            var result = new List<OrganizeTreeOutput>();
+            var parentIdValue = parentId ?? "";
+
+            foreach (var item in list.Where(x => x.ParentId == parentIdValue))
+            {
+                var children = BuildTree(list, item.Id);
+                item.Children = children;
+                result.Add(item);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 获取所有子组织
+        /// </summary>
+        /// <param name="parentId">父级组织ID</param>
+        /// <returns>子组织列表</returns>
+        private async Task<List<OrganizeTreeOutput>> GetAllChildren(string parentId)
+        {
+            var children = await _db.Queryable<OrganizeEntity>()
+                .Where(x => x.ParentId == parentId && x.DeleteMark == null)
+                .Select(x => new OrganizeTreeOutput
+                {
+                    Id = x.Id,
+                    FullName = x.FullName,
+                    EnCode = x.EnCode,
+                    Category = x.Category,
+                    ParentId = x.ParentId,
+                    ManagerId = x.ManagerId,
+                    Description = x.Description,
+                    SortCode = x.SortCode,
+                    EnabledMark = x.EnabledMark
+                })
+                .ToListAsync();
+
+            var allChildren = new List<OrganizeTreeOutput>(children);
+
+            foreach (var child in children)
+            {
+                var grandChildren = await GetAllChildren(child.Id);
+                allChildren.AddRange(grandChildren);
+            }
+
+            return allChildren;
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// 组织比较器
+    /// </summary>
+    public class OrganizeComparer : IEqualityComparer<OrganizeTreeOutput>
+    {
+        /// <summary>
+        /// 比较两个组织是否相等
+        /// </summary>
+        /// <param name="x">组织1</param>
+        /// <param name="y">组织2</param>
+        /// <returns>是否相等</returns>
+        public bool Equals(OrganizeTreeOutput x, OrganizeTreeOutput y)
+        {
+            return x?.Id == y?.Id;
+        }
+
+        /// <summary>
+        /// 获取组织的哈希码
+        /// </summary>
+        /// <param name="obj">组织对象</param>
+        /// <returns>哈希码</returns>
+        public int GetHashCode(OrganizeTreeOutput obj)
+        {
+            return obj?.Id?.GetHashCode() ?? 0;
+        }
+    }
+}
diff --git a/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs b/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs
new file mode 100644
index 0000000..d3e52be
--- /dev/null
+++ b/netcore/src/Modularity/Extend/NCC.Extend/UserService.cs
@@ -0,0 +1,206 @@
+using NCC.Common.Core.Manager;
+using NCC.Common.Enum;
+using NCC.Common.Extension;
+using NCC.Common.Filter;
+using NCC.Dependency;
+using NCC.DynamicApiController;
+using NCC.FriendlyException;
+using NCC.Extend.Interfaces.User;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NCC.System.Entitys.Permission;
+using NCC.Extend.Entitys.Dto.User;
+using NCC.Common.Helper;
+using NCC.JsonSerialization;
+using NCC.Common.Model.NPOI;
+using NCC.Common.Configuration;
+using NCC.DataEncryption;
+using NCC.ClayObject;
+
+namespace NCC.Extend.User
+{
+    /// <summary>
+    /// 用户服务
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "绿纤用户服务", Name = "User", Order = 200)]
+    [Route("api/Extend/[controller]")]
+    public class UserService : IUserService, IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<UserEntity> _userRepository;
+        private readonly SqlSugarScope _db;
+        private readonly IUserManager _userManager;
+
+        /// <summary>
+        /// 初始化一个<see cref="UserService"/>类型的新实例
+        /// </summary>
+        public UserService(
+            ISqlSugarRepository<UserEntity> userRepository,
+            IUserManager userManager)
+        {
+            _userRepository = userRepository;
+            _db = _userRepository.Context;
+            _userManager = userManager;
+        }
+
+        #region 获取用户列表
+
+        /// <summary>
+        /// 获取用户列表
+        /// </summary>
+        [HttpGet("")]
+        public async Task<dynamic> GetUserList([FromQuery] UserListQueryInput input)
+        {
+            var sidx = input.sidx == null ? "id" : input.sidx;
+            var data = await _db.Queryable<UserEntity, OrganizeEntity, PositionEntity, RoleEntity>((u, o, p, r) => new JoinQueryInfos(
+                JoinType.Left, o.Id == SqlFunc.ToString(u.OrganizeId),
+                JoinType.Left, p.Id == SqlFunc.ToString(u.PositionId),
+                JoinType.Left, r.Id == SqlFunc.ToString(u.RoleId)))
+                .WhereIF(!string.IsNullOrEmpty(input.id), u => u.Id.Contains(input.id))
+                .WhereIF(!string.IsNullOrEmpty(input.account), u => u.Account.Contains(input.account))
+                .WhereIF(!string.IsNullOrEmpty(input.realName), u => u.RealName.Contains(input.realName))
+                .WhereIF(!string.IsNullOrEmpty(input.mobilePhone), u => u.MobilePhone.Contains(input.mobilePhone))
+                .WhereIF(!string.IsNullOrEmpty(input.mdid), u => u.Mdid == input.mdid)
+                .WhereIF(!string.IsNullOrEmpty(input.zw), u => u.Zw.Contains(input.zw))
+                .WhereIF(!string.IsNullOrEmpty(input.gw), u => u.Gw.Contains(input.gw))
+                .WhereIF(!string.IsNullOrEmpty(input.gwfl), u => u.Gwfl.Contains(input.gwfl))
+                .WhereIF(!string.IsNullOrEmpty(input.fyft), u => u.Fyft.Contains(input.fyft))
+                .WhereIF(!string.IsNullOrEmpty(input.organizeId), u => u.OrganizeId == input.organizeId)
+                .WhereIF(!string.IsNullOrEmpty(input.positionId), u => u.PositionId == input.positionId)
+                .WhereIF(!string.IsNullOrEmpty(input.roleId), u => u.RoleId == input.roleId)
+                .WhereIF(input.enabledMark.HasValue, u => u.EnabledMark == input.enabledMark)
+                .Where(u => u.DeleteMark == null) // 排除已删除的用户
+                .Select((u, o, p, r) => new UserListOutput
+                {
+                    id = u.Id,
+                    account = u.Account,
+                    realName = u.RealName,
+                    nickName = u.NickName,
+                    headIcon = u.HeadIcon,
+                    gender = u.Gender,
+                    birthday = u.Birthday,
+                    mobilePhone = u.MobilePhone,
+                    telePhone = u.TelePhone,
+                    email = u.Email,
+                    urgentContacts = u.UrgentContacts,
+                    urgentTelePhone = u.UrgentTelePhone,
+                    postalAddress = u.PostalAddress,
+                    signature = u.Signature,
+                    firstLogTime = u.FirstLogTime,
+                    prevLogTime = u.PrevLogTime,
+                    isAdministrator = u.IsAdministrator,
+                    description = u.Description,
+                    sortCode = u.SortCode,
+                    managerId = u.ManagerId,
+                    organizeId = u.OrganizeId,
+                    organizeName = o.FullName,
+                    positionId = u.PositionId,
+                    positionName = p.FullName,
+                    roleId = u.RoleId,
+                    roleName = r.FullName,
+                    portalId = u.PortalId,
+                    extensionStr = u.ExtensionStr,
+                    openId = u.OpenId,
+                    mdid = u.Mdid,
+                    mdmc = "", // 门店名称需要关联门店表获取
+                    zw = u.Zw,
+                    fyft = u.Fyft,
+                    gwfl = u.Gwfl,
+                    gw = u.Gw,
+                    enabledMark = u.EnabledMark,
+                    creatorTime = u.CreatorTime,
+                    creatorUserId = u.CreatorUserId
+                })
+                .MergeTable()
+                .OrderBy(sidx + " " + input.sort)
+                .ToPagedListAsync(input.currentPage, input.pageSize);
+            
+            return PageResult<UserListOutput>.SqlSugarPageResult(data);
+        }
+        #endregion
+
+        #region 获取用户详细信息
+
+        /// <summary>
+        /// 获取用户详细信息
+        /// </summary>
+        [HttpGet("{id}")]
+        public async Task<dynamic> GetUserInfo(string id)
+        {
+            var entity = await _db.Queryable<UserEntity, OrganizeEntity, PositionEntity, RoleEntity>((u, o, p, r) => new JoinQueryInfos(
+                JoinType.Left, o.Id == SqlFunc.ToString(u.OrganizeId),
+                JoinType.Left, p.Id == SqlFunc.ToString(u.PositionId),
+                JoinType.Left, r.Id == SqlFunc.ToString(u.RoleId)))
+                .Where(u => u.Id == id && u.DeleteMark == null)
+                .Select((u, o, p, r) => new UserListOutput
+                {
+                    id = u.Id,
+                    account = u.Account,
+                    realName = u.RealName,
+                    nickName = u.NickName,
+                    headIcon = u.HeadIcon,
+                    gender = u.Gender,
+                    birthday = u.Birthday,
+                    mobilePhone = u.MobilePhone,
+                    telePhone = u.TelePhone,
+                    postalAddress = u.PostalAddress,
+                    signature = u.Signature,
+                    firstLogTime = u.FirstLogTime,
+                    prevLogTime = u.PrevLogTime,
+                    description = u.Description,
+                    managerId = u.ManagerId,
+                    organizeId = u.OrganizeId,
+                    organizeName = o.FullName,
+                    positionId = u.PositionId,
+                    positionName = p.FullName,
+                    roleId = u.RoleId,
+                    roleName = r.FullName,
+                    mdid = u.Mdid,
+                    mdmc = "", // 门店名称需要关联门店表获取
+                    zw = u.Zw,
+                    fyft = u.Fyft,
+                    gwfl = u.Gwfl,
+                    gw = u.Gw,
+                    enabledMark = u.EnabledMark
+                })
+                .MergeTable()
+                .FirstAsync();
+            
+            return entity;
+        }
+        #endregion
+
+        #region 获取用户下拉选择数据
+
+        /// <summary>
+        /// 获取用户下拉选择数据
+        /// </summary>
+        [HttpGet("Selector")]
+        public async Task<dynamic> GetUserSelector([FromQuery] string mdid = null, [FromQuery] string zw = null)
+        {
+            var data = await _db.Queryable<UserEntity>()
+                .WhereIF(!string.IsNullOrEmpty(mdid), u => u.Mdid == mdid)
+                .WhereIF(!string.IsNullOrEmpty(zw), u => u.Zw.Contains(zw))
+                .Where(u => u.EnabledMark == 1 && u.DeleteMark == null)
+                .Select(u => new
+                {
+                    id = u.Id,
+                    account = u.Account,
+                    realName = u.RealName,
+                    mobilePhone = u.MobilePhone,
+                    mdid = u.Mdid,
+                    zw = u.Zw,
+                    gw = u.Gw
+                })
+                .OrderBy(u => u.realName)
+                .ToListAsync();
+            return data;
+        }
+
+        #endregion
+    }
+}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/.DS_Store b/netcore/src/Modularity/Order/NCC.Order.Entitys/.DS_Store
deleted file mode 100644
index 79f5271..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/.DS_Store
+++ /dev/null
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceCrInput.cs
deleted file mode 100644
index 4088a36..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceCrInput.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseUserBalance
-{
-    /// <summary>
-    /// 用户余额变动修改输入参数
-    /// </summary>
-    public class BaseUserBalanceCrInput
-    {
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        public string userId { get; set; }
-        
-        /// <summary>
-        /// 余额变动类型
-        /// </summary>
-        public string type { get; set; }
-        
-        /// <summary>
-        /// 订单号或其他来源
-        /// </summary>
-        public string sourceId { get; set; }
-        
-        /// <summary>
-        /// 余额变动描述
-        /// </summary>
-        public string mark { get; set; }
-        
-        /// <summary>
-        /// 变动时间
-        /// </summary>
-        public DateTime? addTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceInfoOutput.cs
deleted file mode 100644
index e1a4660..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceInfoOutput.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseUserBalance
-{
-    /// <summary>
-    /// 用户余额变动输出参数
-    /// </summary>
-    public class BaseUserBalanceInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        public string userId { get; set; }
-        
-        /// <summary>
-        /// 余额变动类型
-        /// </summary>
-        public string type { get; set; }
-        
-        /// <summary>
-        /// 订单号或其他来源
-        /// </summary>
-        public string sourceId { get; set; }
-        
-        /// <summary>
-        /// 余额变动描述
-        /// </summary>
-        public string mark { get; set; }
-        
-        /// <summary>
-        /// 变动时间
-        /// </summary>
-        public DateTime? addTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListOutput.cs
deleted file mode 100644
index 8336aa3..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListOutput.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-
-namespace NCC.Order.Entitys.Dto.BaseUserBalance
-{
-    /// <summary>
-    /// 用户余额变动输入参数
-    /// </summary>
-    public class BaseUserBalanceListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        public string userId { get; set; }
-        
-        /// <summary>
-        /// 余额变动类型
-        /// </summary>
-        public string type { get; set; }
-        
-        /// <summary>
-        /// 订单号或其他来源
-        /// </summary>
-        public string sourceId { get; set; }
-        
-        /// <summary>
-        /// 余额变动描述
-        /// </summary>
-        public string mark { get; set; }
-        
-        /// <summary>
-        /// 变动时间
-        /// </summary>
-        public DateTime? addTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListQueryInput.cs
deleted file mode 100644
index 9e578a5..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListQueryInput.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseUserBalance
-{
-    /// <summary>
-    /// 用户余额变动列表查询输入
-    /// </summary>
-    public class BaseUserBalanceListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        public string userId { get; set; }
-        
-        /// <summary>
-        /// 余额变动类型
-        /// </summary>
-        public string type { get; set; }
-        
-        /// <summary>
-        /// 订单号或其他来源
-        /// </summary>
-        public string sourceId { get; set; }
-        
-        /// <summary>
-        /// 变动时间
-        /// </summary>
-        public string addTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceUpInput.cs
deleted file mode 100644
index b1d140b..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseUserBalance
-{
-    /// <summary>
-    /// 用户余额变动更新输入参数
-    /// </summary>
-    public class BaseUserBalanceUpInput : BaseUserBalanceCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryCrInput.cs
deleted file mode 100644
index a3d0949..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryCrInput.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseAmountHistory
-{
-    /// <summary>
-    /// 金额流水记录修改输入参数
-    /// </summary>
-    public class BaseAmountHistoryCrInput
-    {
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public decimal money { get; set; }
-        
-        /// <summary>
-        /// 产品/套餐编号
-        /// </summary>
-        public string productId { get; set; }
-        
-        /// <summary>
-        /// 用户编号
-        /// </summary>
-        public string userId { get; set; }
-
-        /// <summary>
-        /// 消费用户编号
-        /// </summary>
-        public string payUserId { get; set; }
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public string source { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int? status { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryInfoOutput.cs
deleted file mode 100644
index 063b33b..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryInfoOutput.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseAmountHistory
-{
-    /// <summary>
-    /// 金额流水记录输出参数
-    /// </summary>
-    public class BaseAmountHistoryInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public decimal money { get; set; }
-        
-        /// <summary>
-        /// 产品/套餐编号
-        /// </summary>
-        public string productId { get; set; }
-        
-        /// <summary>
-        /// 关联订单编号
-        /// </summary>
-        public string orderId { get; set; }
-
-        /// <summary>
-        /// 用户编号
-        /// </summary>
-        public string userId { get; set; }
-        /// <summary>
-        /// 消费用户编号
-        /// </summary>
-        public string payUserId { get; set; }
-
-        /// <summary>
-        /// 用户 
-        /// </summary>
-        public string userName { get; set; }
-        /// <summary>
-        /// 消费用户 
-        /// </summary>
-        public string payUserName { get; set; }
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public string source { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int? status { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        public string deleteUserId { get; set; }
-        
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        public DateTime? deleteTime { get; set; }
-         
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListOutput.cs
deleted file mode 100644
index 88c6f12..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListOutput.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-
-namespace NCC.Order.Entitys.Dto.BaseAmountHistory
-{
-    /// <summary>
-    /// 金额流水记录输入参数
-    /// </summary>
-    public class BaseAmountHistoryListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public decimal money { get; set; }
-
-        /// <summary>
-        /// 产品/套餐编号
-        /// </summary>
-        public string productId { get; set; }
-
-        /// <summary>
-        /// 用户编号
-        /// </summary>
-        public string userId { get; set; }
-        /// <summary>
-        /// 消费用户编号
-        /// </summary>
-        public string payUserId { get; set; }
-
-        /// <summary>
-        /// 用户 
-        /// </summary>
-        public string userName { get; set; }
-        /// <summary>
-        /// 消费用户 
-        /// </summary>
-        public string payUserName { get; set; }
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        public decimal orderMoney { get; set; }
-        /// <summary>
-        /// 订单编号
-        /// </summary>
-        public string orderId { get; set; }
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public string source { get; set; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public int? status { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListQueryInput.cs
deleted file mode 100644
index dc5f917..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListQueryInput.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseAmountHistory
-{
-    /// <summary>
-    /// 金额流水记录列表查询输入
-    /// </summary>
-    public class BaseAmountHistoryListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public string money { get; set; }
-        
-        /// <summary>
-        /// 产品/套餐编号
-        /// </summary>
-        public string productId { get; set; }
-        
-        /// <summary>
-        /// 用户编号
-        /// </summary>
-        public string userId { get; set; }
-        
-        /// <summary>
-        /// 来源
-        /// </summary>
-        public string source { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public string status { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public string creatorTime { get; set; }
-        /// <summary>
-        /// 我的下级分销记录
-        /// </summary>
-        public bool? myChildren { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryUpInput.cs
deleted file mode 100644
index d4b0510..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseAmountHistory
-{
-    /// <summary>
-    /// 金额流水记录更新输入参数
-    /// </summary>
-    public class BaseAmountHistoryUpInput : BaseAmountHistoryCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesCrInput.cs
deleted file mode 100644
index 372a769..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesCrInput.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置修改输入参数
-    /// </summary>
-    public class MarketingRulesCrInput
-    {
-        /// <summary>
-        /// 规则名称
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        public string proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        public string withdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        public string singleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        public string monthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 规则描述
-        /// </summary>
-        public string description { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int? enabledMark { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-        
-        /// <summary>
-        /// 营销规则-等级规则
-        /// </summary>
-        public List<MarketingRulesDetailCrInput> marketingRulesDetailList { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailCrInput.cs
deleted file mode 100644
index 6f9cb5e..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailCrInput.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置修改输入参数
-    /// </summary>
-    public class MarketingRulesDetailCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 等级名称
-        /// </summary>
-        public string name { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        public decimal proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        public decimal withdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-开始
-        /// </summary>
-        public string numberStart { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        public decimal singleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        public int? monthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailInfoOutput.cs
deleted file mode 100644
index 5c9fdca..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailInfoOutput.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置输出参数
-    /// </summary>
-    public class MarketingRulesDetailInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 规则ID
-        /// </summary>
-        public string ruleId { get; set; }
-        
-        /// <summary>
-        /// 等级名称
-        /// </summary>
-        public string name { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        public decimal proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        public decimal withdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-开始
-        /// </summary>
-        public string numberStart { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-结束（备用）
-        /// </summary>
-        public string numberEnd { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        public decimal singleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        public int? monthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        /// <summary>
-        /// 粉丝数
-        /// </summary>
-        public int fansCount { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailUpInput.cs
deleted file mode 100644
index 6a53e94..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置更新输入参数
-    /// </summary>
-    public class MarketingRulesDetailUpInput : MarketingRulesCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesInfoOutput.cs
deleted file mode 100644
index 4b3b572..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesInfoOutput.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置输出参数
-    /// </summary>
-    public class MarketingRulesInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 规则名称
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        public string proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        public string withdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-开始
-        /// </summary>
-        public string numberStart { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-结束（备用）
-        /// </summary>
-        public string numberEnd { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        public string singleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        public string monthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 规则描述
-        /// </summary>
-        public string description { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int? enabledMark { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-        
-        /// <summary>
-        /// 营销规则-等级规则
-        /// </summary>
-        public List<MarketingRulesDetailInfoOutput> marketingRulesDetailList { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListOutput.cs
deleted file mode 100644
index 6d45fa1..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListOutput.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置输入参数
-    /// </summary>
-    public class MarketingRulesListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 规则名称
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        public string proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        public string withdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        public string singleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        public string monthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        public int? enabledMark { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-
-
-        /// <summary>
-        /// 营销规则-等级规则
-        /// </summary>
-        public List<MarketingRulesDetailInfoOutput> details { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListQueryInput.cs
deleted file mode 100644
index d10b5b0..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListQueryInput.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置列表查询输入
-    /// </summary>
-    public class MarketingRulesListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 规则名称
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        public string proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        public string withdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        public string singleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        public string monthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public string creatorTime { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public string lastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-        /// <summary>
-        /// 是否有效  
-        /// </summary>
-        public int? enabledMark { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesUpInput.cs
deleted file mode 100644
index 462e92c..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置更新输入参数
-    /// </summary>
-    public class MarketingRulesUpInput : MarketingRulesCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderCrInput.cs
deleted file mode 100644
index 7c4048e..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderCrInput.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using NCC.Code.JsonSerialization;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseOrder
-{
-    /// <summary>
-    /// 订单模块V1修改输入参数
-    /// </summary>
-    public class BaseOrderCrInput
-    {
-        ///// <summary>
-        ///// 订单标题
-        ///// </summary>
-        //public string title { get; set; }
-
-        ///// <summary>
-        ///// 系统订单编号
-        ///// </summary>
-        //public string orderNumber { get; set; }
-
-        ///// <summary>
-        ///// 下单时间
-        ///// </summary>
-        //public DateTime? orderTime { get; set; }
-
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        public decimal money { get; set; }
-
-        /// <summary>
-        /// 产品ID
-        /// </summary>
-        public string productId { get; set; }
-
-        ///// <summary>
-        ///// 订单状态 关联枚举值/数据字典
-        ///// </summary> 
-        //public Entitys.Enum.OrderStatus? status { get; set; }
-
-        ///// <summary>
-        ///// 下单IP
-        ///// </summary>
-        //public string ip { get; set; }
-
-        ///// <summary>
-        ///// 卖家备注
-        ///// </summary>
-        //public string mark { get; set; }
-
-        /// <summary>
-        /// 订单来源
-        /// </summary>
-        public string source { get; set; }
-
-        /// <summary>
-        /// 支付方式 h5     native = 扫码支付
-        /// </summary>
-        public string payType { get; set; }
-
-        ///// <summary>
-        ///// 三方订单号
-        ///// </summary>
-        //public string thirdPartyOrderNo { get; set; }
-
-        ///// <summary>
-        ///// 创建时间
-        ///// </summary>
-        //public DateTime? creatorTime { get; set; }
-
-        ///// <summary>
-        ///// 创建用户
-        ///// </summary>
-        //public string creatorUserId { get; set; }
-
-        ///// <summary>
-        ///// 修改用户
-        ///// </summary>
-        //public string lastModifyUserId { get; set; }
-
-        ///// <summary>
-        ///// 修改时间
-        ///// </summary>
-        //public DateTime? lastModifyTime { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        ///// <summary>
-        ///// openid
-        ///// </summary>
-        //public string openId { get; set; }
-
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public int amount { get; set; }
-
-
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderInfoOutput.cs
deleted file mode 100644
index 2c5b8bb..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderInfoOutput.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using NCC.Code.JsonSerialization;
-using NCC.Order.Entitys.Dto.BaseProduct;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseOrder
-{
-    /// <summary>
-    /// 订单模块V1输出参数
-    /// </summary>
-    public class BaseOrderInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-
-        /// <summary>
-        /// 订单标题
-        /// </summary>
-        public string title { get; set; }
-
-        /// <summary>
-        /// 系统订单编号
-        /// </summary>
-        public string orderNumber { get; set; }
-
-        /// <summary>
-        /// 下单时间
-        /// </summary>
-        public DateTime? orderTime { get; set; }
-
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        public decimal money { get; set; }
-
-        /// <summary>
-        /// 产品ID
-        /// </summary>
-        public string productId { get; set; }
-
-        /// <summary>
-        /// 订单状态 关联枚举值/数据字典
-        /// </summary>
-        [JsonConverter(typeof(JsonEnumDisplayConverter))]
-        public Entitys.Enum.OrderStatus? status { get; set; }
-
-        /// <summary>
-        /// 发货状态
-        /// </summary>
-        public int? shipStatus { get; set; }
-
-        /// <summary>
-        /// 支付状态
-        /// </summary>
-        public int? payStatus { get; set; }
-
-        /// <summary>
-        /// 商户/店铺/门店ID
-        /// </summary>
-        public string sellerId { get; set; }
-
-        /// <summary>
-        /// 售后状态
-        /// </summary>
-        public string confirmStatus { get; set; }
-
-        /// <summary>
-        /// 确认收货时间
-        /// </summary>
-        public DateTime? confirmTime { get; set; }
-
-        /// <summary>
-        /// 使用积分
-        /// </summary>
-        public string point { get; set; }
-
-        /// <summary>
-        /// 下单IP
-        /// </summary>
-        public string ip { get; set; }
-
-        /// <summary>
-        /// 卖家备注
-        /// </summary>
-        public string mark { get; set; }
-
-        /// <summary>
-        /// 订单来源
-        /// </summary>
-        public string source { get; set; }
-
-        /// <summary>
-        /// 支付方式
-        /// </summary>
-        public string payType { get; set; }
-
-        /// <summary>
-        /// 收货电话
-        /// </summary>
-        public string shipMobile { get; set; }
-
-        /// <summary>
-        /// 收货人姓名
-        /// </summary>
-        public string shipName { get; set; }
-
-        /// <summary>
-        /// 收货详细地址
-        /// </summary>
-        public string shipAddress { get; set; }
-
-        /// <summary>
-        /// 收货地区
-        /// </summary>
-        public string shipArea { get; set; }
-
-        /// <summary>
-        /// 三方订单号
-        /// </summary>
-        public string thirdPartyOrderNo { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        public string deleteUserId { get; set; }
-
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        public DateTime? deleteTime { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        /// <summary>
-        /// 产品信息
-        /// </summary>
-        public BaseProductInfoOutput product { get; set; }
-
-        public decimal year { get; set; }
-        ///// <summary>
-        ///// 卷码信息
-        ///// </summary>
-        //public BaseMyCouponInfoOutput coupon { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListOutput.cs
deleted file mode 100644
index 5ddcc29..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListOutput.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using NCC.Code;
-using NCC.Code.JsonSerialization;
-using NCC.Common.Helper;
-using NCC.Common.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
-
-namespace NCC.Order.Entitys.Dto.BaseOrder
-{
-    /// <summary>
-    /// 订单模块V1输入参数
-    /// </summary>
-    public class BaseOrderListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-
-        /// <summary>
-        /// 订单标题
-        /// </summary>
-        public string title { get; set; }
-
-        /// <summary>
-        /// 系统订单编号
-        /// </summary>
-        public string orderNumber { get; set; }
-
-        /// <summary>
-        /// 下单时间
-        /// </summary>
-        public DateTime? orderTime { get; set; }
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public int amount { get; set; }
-
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        public decimal money { get; set; }
-
-        /// <summary>
-        /// 产品ID
-        /// </summary>
-        public string productId { get; set; }
-        /// <summary>
-        /// 产品名字
-        /// </summary>
-        public string productName { get; set; }
-
-        /// <summary>
-        /// 订单状态 关联枚举值/数据字典
-        /// </summary>
-        [JsonConverter(typeof(JsonEnumDisplayConverter))]
-        public Entitys.Enum.OrderStatus? status { get; set; }
-        /// <summary>
-        /// 状态说明
-        /// </summary>
-        public string statusName
-        {
-            get
-            {
-                try
-                {
-                    var list = EnumHelper.EnumToList<Entitys.Enum.OrderStatus>(false);
-                    return list.First(o => o.Key == status.GetHashCode()).Desc;
-                }
-                catch (Exception)
-                {
-                    return "未知";
-                }
-            }
-        }
-
-        /// <summary>
-        /// 下单IP
-        /// </summary>
-        public string ip { get; set; }
-
-        /// <summary>
-        /// 卖家备注
-        /// </summary>
-        public string mark { get; set; }
-
-        /// <summary>
-        /// 订单来源
-        /// </summary>
-        public string source { get; set; }
-
-        /// <summary>
-        /// 支付方式
-        /// </summary>
-        public string payType { get; set; }
-
-        /// <summary>
-        /// 三方订单号
-        /// </summary>
-        public string thirdPartyOrderNo { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        /// <summary>
-        /// 商品标题
-        /// </summary>
-        public string productTitle { get; set; }
-
-        /// <summary>
-        /// 下单用户
-        /// </summary>
-        public string userFullName { get; set; }
-        /// <summary>
-        /// 商家名
-        /// </summary>
-        public string businessName { get; set; }
-
-        /// <summary>
-        /// 商品图片集合
-        /// </summary>
-        public string images { get; set; }
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string phone { get; set; }
-        /// <summary>
-        /// 商品图片集合
-        /// </summary>
-        public List<FileControlsModel> imagelist
-        {
-            get
-            {
-                try
-                {
-                    return images.ToObject<List<FileControlsModel>>();
-                }
-                catch (Exception)
-                {
-                    return new List<FileControlsModel>();
-                }
-            }
-        }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListQueryInput.cs
deleted file mode 100644
index 49518e3..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListQueryInput.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseOrder
-{
-    /// <summary>
-    /// 订单模块V1列表查询输入
-    /// </summary>
-    public class BaseOrderListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 订单标题
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 系统订单编号
-        /// </summary>
-        public string orderNumber { get; set; }
-        
-        /// <summary>
-        /// 下单时间
-        /// </summary>
-        public string orderTime { get; set; }
-        
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        public string money { get; set; }
-
-        /// <summary>
-        /// 订单状态 关联枚举值/数据字典
-        /// </summary>
-        public Entitys.Enum.OrderStatus? status { get; set; }
-
-        /// <summary>
-        /// 卖家备注
-        /// </summary>
-        public string mark { get; set; }
-        
-        /// <summary>
-        /// 支付方式
-        /// </summary>
-        public string payType { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUnOrderResult.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUnOrderResult.cs
deleted file mode 100644
index dbb2b06..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUnOrderResult.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using NCC.Code.JsonSerialization;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseOrder
-{
-    /// <summary>
-    /// 下单返回
-    /// </summary>
-    public class BaseOrderUnOrderResult
-    {
-
-        public string Id { get; set; }
-        /// <summary>
-        /// 订单标题
-        /// </summary>
-        public string title { get; set; }
-
-        /// <summary>
-        /// 系统订单编号
-        /// </summary>
-        public string orderNumber { get; set; }
-
-        /// <summary>
-        /// 下单时间
-        /// </summary>
-        public DateTime? orderTime { get; set; }
-
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        public decimal money { get; set; }
-
-        /// <summary>
-        /// 产品ID
-        /// </summary>
-        public string productId { get; set; }
-
-        /// <summary>
-        /// openid
-        /// </summary>
-        public string openId { get; set; }
-
-        public dynamic data { get; set; }
-        /// <summary>
-        /// 二维码 base64
-        /// </summary>
-        public string qrCode { get; set; }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUpInput.cs
deleted file mode 100644
index a662628..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseOrder
-{
-    /// <summary>
-    /// 订单模块V1更新输入参数
-    /// </summary>
-    public class BaseOrderUpInput : BaseOrderCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductCrInput.cs
deleted file mode 100644
index 96e5108..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductCrInput.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NCC.Common.Model;
-using SqlSugar;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1修改输入参数
-    /// </summary>
-    public class BaseProductCrInput
-    {
-        /// <summary>
-        /// 产品名称
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 有效期开始时间
-        /// </summary>
-        public DateTime? validStart { get; set; }
-        
-        /// <summary>
-        /// 有效期结束时间
-        /// </summary>
-        public DateTime? validEnd { get; set; }
-        
-        /// <summary>
-        /// 金额/单价
-        /// </summary>
-        public decimal price { get; set; }
-        
-        /// <summary>
-        /// 原价
-        /// </summary>
-        public decimal originalPrice { get; set; }
-        
-        /// <summary>
-        /// 折扣
-        /// </summary>
-        public double discount { get; set; }
-        
-        /// <summary>
-        /// 图片集合
-        /// </summary>
-        public List<FileControlsModel> images { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string tags { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 商品详情
-        /// </summary>
-        public List<BaseProductDetailsCrInput> baseProductDetailsList { get; set; }
-        /// <summary>
-        /// 商家ID
-        /// </summary>
-        public string BusinessId { get; set; }
-        /// <summary>
-        /// 年
-        /// </summary>
-        public double year { get; set; }
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public long volume { get; set; }
-        /// <summary>
-        /// 产品类型
-        /// </summary>
-
-        public string type { get; set; }
-
-        /// <summary>
-        /// 商品描述
-        /// </summary> 
-        public string remark { get; set; }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsCrInput.cs
deleted file mode 100644
index a148abc..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsCrInput.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1修改输入参数
-    /// </summary>
-    public class BaseProductDetailsCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 标题
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 是否能使用优惠券
-        /// </summary>
-        public bool isUseCoupo { get; set; }
-        
-        /// <summary>
-        /// 价格
-        /// </summary>
-        public decimal price { get; set; }
-        
-        /// <summary>
-        /// 原价
-        /// </summary>
-        public decimal orgPrice { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsInfoOutput.cs
deleted file mode 100644
index f911946..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsInfoOutput.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1输出参数
-    /// </summary>
-    public class BaseProductDetailsInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 关联商品
-        /// </summary>
-        public string productId { get; set; }
-        
-        /// <summary>
-        /// 标题
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string type { get; set; }
-        
-        /// <summary>
-        /// 是否能使用优惠券
-        /// </summary>
-        public bool? isUseCoupo { get; set; }
-        
-        /// <summary>
-        /// 价格
-        /// </summary>
-        public decimal price { get; set; }
-        
-        /// <summary>
-        /// 原价
-        /// </summary>
-        public decimal orgPrice { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsUpInput.cs
deleted file mode 100644
index db9bb94..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1更新输入参数
-    /// </summary>
-    public class BaseProductDetailsUpInput : BaseProductCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductInfoOutput.cs
deleted file mode 100644
index 240183c..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductInfoOutput.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NCC.Common.Model; 
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1输出参数
-    /// </summary>
-    public class BaseProductInfoOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-        /// <summary>
-        /// 产品名称
-        /// </summary>
-        public string title { get; set; }
-        
-        /// <summary>
-        /// 有效期开始时间
-        /// </summary>
-        public DateTime? validStart { get; set; }
-        
-        /// <summary>
-        /// 有效期结束时间
-        /// </summary>
-        public DateTime? validEnd { get; set; }
-        
-        /// <summary>
-        /// 金额/单价
-        /// </summary>
-        public decimal price { get; set; }
-        
-        /// <summary>
-        /// 原价
-        /// </summary>
-        public decimal originalPrice { get; set; }
-        
-        /// <summary>
-        /// 折扣
-        /// </summary>
-        public decimal discount { get; set; }
-        
-        /// <summary>
-        /// 折后价
-        /// </summary>
-        public decimal discountPrice { get; set; }
-        
-        /// <summary>
-        /// 门店
-        /// </summary>
-        public string store { get; set; }
-        
-        /// <summary>
-        /// 经度
-        /// </summary>
-        public string longitude { get; set; }
-        
-        /// <summary>
-        /// 纬度
-        /// </summary>
-        public string latitude { get; set; }
-        
-        /// <summary>
-        /// 缩略图
-        /// </summary>
-        public string thumbnail { get; set; }
-        
-        /// <summary>
-        /// 图片集合
-        /// </summary>
-        public List<FileControlsModel> images { get; set; }
-        
-        /// <summary>
-        /// 主图
-        /// </summary>
-        public string manImage { get; set; }
-        
-        /// <summary>
-        /// 产品类型
-        /// </summary>
-        public string type { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        public string description { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-        
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        public string deleteUserId { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-        
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        public DateTime? deleteTime { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        public long sortCode { get; set; }
-        
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string tags { get; set; }
-        
-        /// <summary>
-        /// 商品描述
-        /// </summary>
-        public string remark { get; set; }
-        
-        /// <summary>
-        /// 产品状态
-        /// </summary>
-        public int? status { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-        
-        /// <summary>
-        /// 商品详情
-        /// </summary>
-        public List<BaseProductDetailsInfoOutput> baseProductDetailsList { get; set; }
-
-        /// <summary>
-        /// 商家ID
-        /// </summary>
-        public string F_BusinessId { get; set; }
-        ///// <summary>
-        ///// 商家信息
-        ///// </summary>
-        //public BaseBusinessInfoOutput BusinessInfo { get; set; }
-
-        public int Visit { get; set; }
-
-
-        /// <summary>
-        /// 年
-        /// </summary>
-        public decimal year { get; set; }
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public long volume { get; set; }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListOutput.cs
deleted file mode 100644
index e09f644..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListOutput.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Common.Model; 
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1输入参数
-    /// </summary>
-    public class BaseProductListOutput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-
-        /// <summary>
-        /// 产品名称
-        /// </summary>
-        public string title { get; set; }
-
-        /// <summary>
-        /// 有效期开始时间
-        /// </summary>
-        public DateTime? validStart { get; set; }
-
-        /// <summary>
-        /// 有效期结束时间
-        /// </summary>
-        public DateTime? validEnd { get; set; }
-
-        /// <summary>
-        /// 金额/单价
-        /// </summary>
-        public decimal price { get; set; }
-
-        /// <summary>
-        /// 原价
-        /// </summary>
-        public decimal originalPrice { get; set; }
-
-        /// <summary>
-        /// 折扣
-        /// </summary>
-        public decimal discount { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime? creatorTime { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? lastModifyTime { get; set; }
-
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        public string lastModifyUserId { get; set; }
-
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string tags { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        public string creatorUserId { get; set; }
-
-        /// <summary>
-        /// 图片集合
-        /// </summary>
-        public string images { get; set; }
-        /// <summary>
-        /// 图片集合
-        /// </summary>
-        public List<FileControlsModel> imagelist
-        {
-            get
-            {
-
-                try
-                {
-                    return images.ToObject<List<FileControlsModel>>();
-                }
-                catch (Exception)
-                {
-                    return new List<FileControlsModel>();
-                }
-            }
-        }
-
-        /// <summary>
-        /// 商家ID
-        /// </summary>
-        public string F_BusinessId { get; set; }
-        ///// <summary>
-        ///// 商家信息
-        ///// </summary>
-        //public BaseBusinessInfoOutput BusinessInfo { get; set; }
-
-        public int Visit { get; set; }
-
-        /// <summary>
-        /// 年
-        /// </summary>
-        public decimal year { get; set; }
-        /// <summary>
-        /// 容量
-        /// </summary>
-        public long volume { get; set; }
-        /// <summary>
-        /// 产品类型
-        /// </summary>
-
-        public string type { get; set; }
-
-        /// <summary>
-        /// 商品描述
-        /// </summary> 
-        public string remark { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListQueryInput.cs
deleted file mode 100644
index b598a93..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListQueryInput.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using NCC.Common.Filter;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1列表查询输入
-    /// </summary>
-    public class BaseProductListQueryInput : PageInputBase
-    {
-        /// <summary>
-        /// 选择导出数据key
-        /// </summary>
-        public string selectKey { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public int dataType { get; set; }
-
-
-        /// <summary>
-        /// 产品名称
-        /// </summary>
-        public string title { get; set; }
-
-        /// <summary>
-        /// 有效期开始时间
-        /// </summary>
-        public string validStart { get; set; }
-
-        /// <summary>
-        /// 有效期结束时间
-        /// </summary>
-        public string validEnd { get; set; }
-
-        /// <summary>
-        /// 金额/单价
-        /// </summary>
-        public string price { get; set; }
-
-        /// <summary>
-        /// 原价
-        /// </summary>
-        public string originalPrice { get; set; }
-
-        /// <summary>
-        /// 标签
-        /// </summary>
-        public string tags { get; set; }
-        /// <summary>
-        /// 商家ID
-        /// </summary>
-
-        public string BusinessId { get; set; }
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string type { get; set; }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductUpInput.cs
deleted file mode 100644
index 2279896..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductUpInput.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Dto.BaseProduct
-{
-    /// <summary>
-    /// 产品信息V1更新输入参数
-    /// </summary>
-    public class BaseProductUpInput : BaseProductCrInput
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public string id { get; set; }
-        
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseAmountHistoryEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseAmountHistoryEntity.cs
deleted file mode 100644
index 0537275..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseAmountHistoryEntity.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 金额流水记录
-    /// </summary>
-    [SugarTable("base_amount_history")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseAmountHistoryEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 容量
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Money")]        
-        public decimal Money { get; set; }
-        
-        /// <summary>
-        /// 产品/套餐编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ProductId")]        
-        public string ProductId { get; set; }
-        
-        /// <summary>
-        /// 关联订单编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Order_id")]        
-        public string OrderId { get; set; }
-        
-        /// <summary>
-        /// 用户编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_UserId")]        
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// 消费用户编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PayUserId")]
-        public string PayUserId { get; set; }
-
-
-        /// <summary>
-        /// 来源
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Source")]        
-        public string Source { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        [SugarColumn(ColumnName = "F_status")]        
-        public int? Status { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]        
-        public DateTime? CreatorTime { get; set; }
-        
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteUserId")]        
-        public string DeleteUserId { get; set; }
-        
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteTime")]        
-        public DateTime? DeleteTime { get; set; }
-
-        /// <summary>
-        /// 有效期开始时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ValidStart")]
-        public DateTime? ValidStart { get; set; }
-
-        /// <summary>
-        /// 有效期结束时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ValidEnd")]
-        public DateTime? ValidEnd { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseBusinessEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseBusinessEntity.cs
deleted file mode 100644
index 4e4afd1..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseBusinessEntity.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 商家信息
-    /// </summary>
-    [SugarTable("base_business")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseBusinessEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SortCode")]
-        public long SortCode { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Description")]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorUserId")]
-        public string CreatorUserId { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]
-        public DateTime? CreatorTime { get; set; }
-
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteUserId")]
-        public string DeleteUserId { get; set; }
-
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteTime")]
-        public DateTime? DeleteTime { get; set; }
-
-        /// <summary>
-        /// 有效标志
-        /// </summary>
-        [SugarColumn(ColumnName = "F_EnabledMark")]
-        public int? EnabledMark { get; set; }
-
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyUserId")]
-        public string LastModifyUserId { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyTime")]
-        public DateTime? LastModifyTime { get; set; }
-
-        /// <summary>
-        /// 商家名称
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 联系电话
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Phone")]
-        public string Phone { get; set; }
-
-        /// <summary>
-        /// 标签
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Tags")]
-        public string Tags { get; set; }
-
-        /// <summary>
-        /// 图片
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Images")]
-        public string Images { get; set; }
-
-        /// <summary>
-        /// 地址
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Adress")]
-        public string Adress { get; set; }
-
-        /// <summary>
-        /// 经度
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Longitude")]
-        public string Longitude { get; set; }
-
-        /// <summary>
-        /// 维度
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Latitude")]
-        public string Latitude { get; set; }
-
-        /// <summary>
-        /// 区域，省市
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Area")]
-        public string Area { get; set; }
-
-        /// <summary>
-        /// 商家Logo
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Logo")]
-        public string Logo { get; set; }
-
-        /// <summary>
-        /// 均价/人
-        /// </summary>
-        [SugarColumn(ColumnName = "F_AvgPrice")]
-        public string AvgPrice { get; set; }
-
-        /// <summary>
-        /// 营业时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_BusinessHours")]
-        public string BusinessHours { get; set; }
-
-        /// <summary>
-        /// 关联用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ReUserId")]
-        public string ReUserId { get; set; }
-
-
-        /// <summary>
-        /// 商家分类
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Category")]
-        public string Category { get; set; }
-
-        /// <summary>
-        /// 是否首页置顶
-        /// </summary>
-        [SugarColumn(ColumnName = "F_HomeTop")]
-        public bool HomeTop { get; set; }
-
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseMyCouponEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseMyCouponEntity.cs
deleted file mode 100644
index ce16783..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseMyCouponEntity.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 优惠券记录
-    /// </summary>
-    [SugarTable("base_my_coupon")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseMyCouponEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 我的优惠券
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ProductId")]        
-        public string ProductId { get; set; }
-        
-        /// <summary>
-        /// 订单ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OrderId")]        
-        public string OrderId { get; set; }
-        
-        /// <summary>
-        /// 券码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CoupnCode")]        
-        public string CoupnCode { get; set; }
-        
-        /// <summary>
-        /// 二维码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_QrCode")]        
-        public string QrCode { get; set; }
-        
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_UserId")]        
-        public string UserId { get; set; }
-        
-        /// <summary>
-        /// 是否使用
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IsUsed")]        
-        public bool? IsUsed { get; set; }
-        
-        /// <summary>
-        /// 使用商品ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_UsedId")]        
-        public string UsedId { get; set; }
-        
-        /// <summary>
-        /// 有效开始时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_StartTime")]        
-        public DateTime? StartTime { get; set; }
-        
-        /// <summary>
-        /// 有效结束时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_EndTime")]        
-        public DateTime? EndTime { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Remark")]        
-        public string Remark { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]        
-        public DateTime? CreatorTime { get; set; }
-        
-        /// <summary>
-        /// 总金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_TotalMoney")]        
-        public decimal TotalMoney { get; set; }
-        
-        /// <summary>
-        /// 使用金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_UsedMoney")]        
-        public decimal UsedMoney { get; set; }
-        
-        /// <summary>
-        /// 剩余金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OverMoney")]        
-        public decimal OverMoney { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseOrderEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseOrderEntity.cs
deleted file mode 100644
index 3849f7c..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseOrderEntity.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 订单模块V1
-    /// </summary>
-    [SugarTable("base_order")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseOrderEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 订单标题
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Title")]
-        public string Title { get; set; }
-
-        /// <summary>
-        /// 系统订单编号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OrderNumber")]
-        public string OrderNumber { get; set; }
-
-        /// <summary>
-        /// 下单时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OrderTime")]
-        public DateTime? OrderTime { get; set; }
-
-        /// <summary>
-        /// 订单金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Money")]
-        public decimal Money { get; set; }
-
-        /// <summary>
-        /// 产品ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ProductId")]
-        public string ProductId { get; set; }
-
-        /// <summary>
-        /// 订单状态 关联枚举值/数据字典
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Status")]
-        public Entitys.Enum.OrderStatus? Status { get; set; }
-
-        /// <summary>
-        /// 发货状态
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ShipStatus")]
-        public int? ShipStatus { get; set; }
-
-        /// <summary>
-        /// 支付状态
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PayStatus")]
-        public int? PayStatus { get; set; }
-
-        /// <summary>
-        /// 商户/店铺/门店ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SellerId")]
-        public string SellerId { get; set; }
-
-        /// <summary>
-        /// 售后状态
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ConfirmStatus")]
-        public string ConfirmStatus { get; set; }
-
-        /// <summary>
-        /// 确认收货时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ConfirmTime")]
-        public DateTime? ConfirmTime { get; set; }
-
-        /// <summary>
-        /// 使用积分
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Point")]
-        public string Point { get; set; }
-
-        /// <summary>
-        /// 下单IP
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IP")]
-        public string Ip { get; set; }
-
-        /// <summary>
-        /// 卖家备注
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Mark")]
-        public string Mark { get; set; }
-
-        /// <summary>
-        /// 订单来源
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Source")]
-        public string Source { get; set; }
-
-        /// <summary>
-        /// 支付方式
-        /// </summary>
-        [SugarColumn(ColumnName = "F_PayType")]
-        public string PayType { get; set; }
-
-        /// <summary>
-        /// 收货电话
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ShipMobile")]
-        public string ShipMobile { get; set; }
-
-        /// <summary>
-        /// 收货人姓名
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ShipName")]
-        public string ShipName { get; set; }
-
-        /// <summary>
-        /// 收货详细地址
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ShipAddress")]
-        public string ShipAddress { get; set; }
-
-        /// <summary>
-        /// 收货地区
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ShipArea")]
-        public string ShipArea { get; set; }
-
-        /// <summary>
-        /// 三方订单号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ThirdPartyOrderNo")]
-        public string ThirdPartyOrderNo { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]
-        public DateTime? CreatorTime { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorUserId")]
-        public string CreatorUserId { get; set; }
-
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyUserId")]
-        public string LastModifyUserId { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyTime")]
-        public DateTime? LastModifyTime { get; set; }
-
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteUserId")]
-        public string DeleteUserId { get; set; }
-
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteTime")]
-        public DateTime? DeleteTime { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Description")]
-        public string Description { get; set; }
-
-
-        /// <summary>
-        /// wx openid
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OpenId")]
-        public string OpenId { get; set; }
-
-
-        /// <summary>
-        /// 单价
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Price")]
-        public decimal Price { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Amount")]
-        public int Amount { get; set; }
-
-     
-
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductDetailsEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductDetailsEntity.cs
deleted file mode 100644
index b86cf02..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductDetailsEntity.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 产品信息
-    /// </summary>
-    [SugarTable("base_product_details")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseProductDetailsEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 关联商品
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ProductId")]
-        public string ProductId { get; set; }
-
-        /// <summary>
-        /// 标题
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Title")]
-        public string Title { get; set; }
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Type")]
-        public string Type { get; set; }
-
-        /// <summary>
-        /// 是否能使用优惠券
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IsUseCoupo")]
-        public bool IsUseCoupo { get; set; }
-
-        /// <summary>
-        /// 价格
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Price")]
-        public decimal Price { get; set; }
-
-        /// <summary>
-        /// 原价
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OrgPrice")]
-        public decimal OrgPrice { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Remark")]
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SortCode")]
-        public long SortCode { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorUserId")]
-        public string CreatorUserId { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]
-        public DateTime? CreatorTime { get; set; }
-
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductEntity.cs
deleted file mode 100644
index 28f4523..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductEntity.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 产品信息V1
-    /// </summary>
-    [SugarTable("base_product")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseProductEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 产品名称
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Title")]
-        public string Title { get; set; }
-
-        /// <summary>
-        /// 有效期开始时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ValidStart")]
-        public DateTime? ValidStart { get; set; }
-
-        /// <summary>
-        /// 有效期结束时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ValidEnd")]
-        public DateTime? ValidEnd { get; set; }
-
-        /// <summary>
-        /// 金额/单价
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Price")]
-        public decimal Price { get; set; }
-
-        /// <summary>
-        /// 原价
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OriginalPrice")]
-        public decimal OriginalPrice { get; set; }
-
-        /// <summary>
-        /// 折扣
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Discount")]
-        public decimal Discount { get; set; }
-
-        /// <summary>
-        /// 折后价
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DiscountPrice")]
-        public decimal DiscountPrice { get; set; }
-
-        /// <summary>
-        /// 门店
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Store")]
-        public string Store { get; set; }
-
-        /// <summary>
-        /// 经度
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Longitude")]
-        public string Longitude { get; set; }
-
-        /// <summary>
-        /// 纬度
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Latitude")]
-        public string Latitude { get; set; }
-
-        /// <summary>
-        /// 缩略图
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Thumbnail")]
-        public string Thumbnail { get; set; }
-
-        /// <summary>
-        /// 图片集合
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Images")]
-        public string Images { get; set; }
-
-        /// <summary>
-        /// 主图
-        /// </summary>
-        [SugarColumn(ColumnName = "F_ManImage")]
-        public string ManImage { get; set; }
-
-        /// <summary>
-        /// 产品类型
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Type")]
-        public string Type { get; set; }
-
-        /// <summary>
-        /// 描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Description")]
-        public string Description { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]
-        public DateTime? CreatorTime { get; set; }
-
-        /// <summary>
-        /// 删除用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteUserId")]
-        public string DeleteUserId { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyTime")]
-        public DateTime? LastModifyTime { get; set; }
-
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyUserId")]
-        public string LastModifyUserId { get; set; }
-
-        /// <summary>
-        /// 删除时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DeleteTime")]
-        public DateTime? DeleteTime { get; set; }
-
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SortCode")]
-        public long SortCode { get; set; }
-
-        /// <summary>
-        /// 标签
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Tags")]
-        public string Tags { get; set; }
-
-        /// <summary>
-        /// 商品描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Remark")]
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 产品状态
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Status")]
-        public int? Status { get; set; }
-
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorUserId")]
-        public string CreatorUserId { get; set; }
-
-        /// <summary>
-        /// 商家ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_BusinessId")]
-        public string BusinessId { get; set; }
-        /// <summary>
-        /// 查看量
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Visit")]
-        public int Visit { get; set; }
-
-        /// <summary>
-        /// 容量
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Volume")]
-        public long volume { get; set; }
-
-        /// <summary>
-        /// 有效期-年
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Year")]
-        public decimal Year { get; set; }
-
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseUserBalanceEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseUserBalanceEntity.cs
deleted file mode 100644
index 0a2d4fa..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseUserBalanceEntity.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 用户余额变动
-    /// </summary>
-    [SugarTable("base_user_balance")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseUserBalanceEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_UserId")]        
-        public string UserId { get; set; }
-        
-        /// <summary>
-        /// 余额变动类型
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Type")]        
-        public string Type { get; set; }
-        
-        /// <summary>
-        /// 订单号或其他来源
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SourceId")]        
-        public string SourceId { get; set; }
-        
-        /// <summary>
-        /// 余额变动描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Mark")]        
-        public string Mark { get; set; }
-        
-        /// <summary>
-        /// 变动时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_AddTime")]   
-        public DateTime? AddTime { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesDetailEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesDetailEntity.cs
deleted file mode 100644
index 9e6d7d1..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesDetailEntity.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 分销规则设置
-    /// </summary>
-    [SugarTable("marketing_rules_detail")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class MarketingRulesDetailEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 规则ID
-        /// </summary>
-        [SugarColumn(ColumnName = "F_RuleId")]        
-        public string RuleId { get; set; }
-        
-        /// <summary>
-        /// 等级名称
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Name")]        
-        public string Name { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Proportion")]        
-        public decimal Proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        [SugarColumn(ColumnName = "F_WithdrawalMoney")]        
-        public decimal WithdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-开始
-        /// </summary>
-        [SugarColumn(ColumnName = "F_NumberStart")]        
-        public string NumberStart { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-结束（备用）
-        /// </summary>
-        [SugarColumn(ColumnName = "F_NumberEnd")]        
-        public string NumberEnd { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SingleMaxWithdrawalAmount")]        
-        public decimal SingleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        [SugarColumn(ColumnName = "F_MonthWithdrawalCount")]        
-        public int? MonthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SortCode")]        
-        public long SortCode { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Description")]        
-        public string Description { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesEntity.cs
deleted file mode 100644
index d6c64ca..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesEntity.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Order.Entitys
-{
-    /// <summary>
-    /// 分销规则设置
-    /// </summary>
-    [SugarTable("marketing_rules")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class MarketingRulesEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 规则名称
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Title")]        
-        public string Title { get; set; }
-        
-        /// <summary>
-        /// 提成比例
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Proportion")]        
-        public string Proportion { get; set; }
-        
-        /// <summary>
-        /// 满多少能提现
-        /// </summary>
-        [SugarColumn(ColumnName = "F_WithdrawalMoney")]        
-        public string WithdrawalMoney { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-开始
-        /// </summary>
-        [SugarColumn(ColumnName = "F_NumberStart")]        
-        public string NumberStart { get; set; }
-        
-        /// <summary>
-        /// 粉丝量范围-结束（备用）
-        /// </summary>
-        [SugarColumn(ColumnName = "F_NumberEnd")]        
-        public string NumberEnd { get; set; }
-        
-        /// <summary>
-        /// 单次最大提现金额
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SingleMaxWithdrawalAmount")]        
-        public string SingleMaxWithdrawalAmount { get; set; }
-        
-        /// <summary>
-        /// 每个月能提现的数量
-        /// </summary>
-        [SugarColumn(ColumnName = "F_MonthWithdrawalCount")]        
-        public string MonthWithdrawalCount { get; set; }
-        
-        /// <summary>
-        /// 规则描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Description")]        
-        public string Description { get; set; }
-        
-        /// <summary>
-        /// 备注
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Remark")]        
-        public string Remark { get; set; }
-        
-        /// <summary>
-        /// 是否有效
-        /// </summary>
-        [SugarColumn(ColumnName = "F_EnabledMark")]        
-        public int? EnabledMark { get; set; }
-        
-        /// <summary>
-        /// 排序码
-        /// </summary>
-        [SugarColumn(ColumnName = "F_SortCode")]        
-        public long SortCode { get; set; }
-        
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]        
-        public DateTime? CreatorTime { get; set; }
-        
-        /// <summary>
-        /// 创建用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorUserId")]        
-        public string CreatorUserId { get; set; }
-        
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyTime")]        
-        public DateTime? LastModifyTime { get; set; }
-        
-        /// <summary>
-        /// 修改用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_LastModifyUserId")]        
-        public string LastModifyUserId { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/MonthHistoryEnum.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/MonthHistoryEnum.cs
deleted file mode 100644
index 6c8010a..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/MonthHistoryEnum.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using NCC.Dependency;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NCC.Food.Entitys.Enum
-{
-    /// <summary>
-    /// 资金类型
-    /// </summary>
-    [SuppressSniffer]
-    public enum MoneyHistoryType
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        [Description("未知")]
-        未知 = 0, 
-        /// <summary>
-        /// 分销提成
-        /// </summary>
-        [Description("分销提成")]
-        分销提成 = 1,
-        /// <summary>
-        /// 余额消费
-        /// </summary>
-        [Description("余额消费")]
-        余额消费 = 3,
-        /// <summary>
-        /// 充值
-        /// </summary>
-        [Description("充值")]
-        充值 = 4,
-        /// <summary>
-        /// 砖石
-        /// </summary>
-        [Description("砖石")]
-        砖石 = 5,
-        /// <summary>
-        /// 提现
-        /// </summary>
-        [Description("提现")]
-        提现 = 6,
-        /// <summary>
-        /// 匹配次数
-        /// </summary>
-        [Description("匹配次数")]
-        匹配次数 = 7,
-        /// <summary>
-        /// 消费
-        /// </summary>
-        [Description("消费")]
-        消费 = 11,
-
-        /// <summary>
-        /// 退款
-        /// </summary>
-        [Description("退款")]
-        退款 = 12,
-
-    }
-
-    /// <summary>
-    /// 金额状态枚举
-    /// </summary>
-    public enum PriceStatus
-    {
-        /// <summary>
-        /// 可用
-        /// </summary>
-        [Description("可用")]
-        可用 = 1,
-        /// <summary>
-        /// 锁定
-        /// </summary>
-        [Description("锁定")]
-        锁定 = 2,
-        /// <summary>
-        /// 冻结
-        /// </summary>
-        [Description("冻结")]
-        冻结 = 3,
-        /// <summary>
-        /// 无效
-        /// </summary>
-        [Description("无效")]
-        无效 = 4,
-        /// <summary>
-        /// 使用
-        /// </summary>
-        [Description("使用")]
-        使用 = 5,
-        /// <summary>
-        /// 其他
-        /// </summary>
-        [Description("其他")]
-        其他 = 99,
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/OrderEnum.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/OrderEnum.cs
deleted file mode 100644
index b85bf56..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/OrderEnum.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using NCC.Dependency;
-using System.ComponentModel;
-
-namespace NCC.Order.Entitys.Enum
-{
-    [SuppressSniffer]
-    public enum OrderStatus
-    {
-        /// <summary>
-        /// 订单正常
-        /// </summary>
-        [Description("未支付")]
-        No = 1,
-        /// <summary>
-        /// 已支付
-        /// </summary>
-        [Description("已支付")]
-        Yes = 2,
-        /// <summary>
-        /// 订单取消
-        /// </summary>
-        [Description("订单取消")]
-        Cancel = 3,
-        /// <summary>
-        /// 部分退款
-        /// </summary>
-        [Description("部分退款")]
-        PartialNo = 4,
-        /// <summary>
-        /// 已退款
-        /// </summary>
-        [Description("已退款")]
-        Refunded = 5,
-        /// <summary>
-        /// 已完成
-        /// </summary>
-        [Description("已完成")]
-        End = 9
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseAmountHistoryMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseAmountHistoryMapper.cs
deleted file mode 100644
index 7712237..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseAmountHistoryMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Order.Entitys.Dto.BaseAmountHistory;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.BaseAmountHistory
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseBusinessMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseBusinessMapper.cs
deleted file mode 100644
index 29bc9fb..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseBusinessMapper.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using NCC.Common.Helper; 
-using Mapster;
-using System.Collections.Generic;
-using NCC.Code;
-
-namespace NCC.Order.Entitys.Mapper.BaseBusiness
-{
-    public class Mapper : IRegister
-    {
-        public void Register(TypeAdapterConfig config)
-        {
-            //config.ForType<BaseBusinessCrInput, BaseBusinessEntity>()
-            //  .BeforeMapping((src, desc) =>
-            //  {
-            //      desc.Images = src.images.ToJson();
-            //  });
-
-            //config.ForType<BaseBusinessEntity, BaseBusinessInfoOutput>()
-            //.BeforeMapping((src, desc) =>
-            //{
-            //    desc.images = src.Images.ToObject();
-            //});
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseMyCouponMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseMyCouponMapper.cs
deleted file mode 100644
index 61ccc1d..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseMyCouponMapper.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using NCC.Common.Helper; 
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.BaseMyCoupon
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseOrderMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseOrderMapper.cs
deleted file mode 100644
index 34c6aec..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseOrderMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Order.Entitys.Dto.BaseOrder;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.BaseOrder
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductDetailsMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductDetailsMapper.cs
deleted file mode 100644
index 3cb2f30..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductDetailsMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Order.Entitys.Dto.BaseProduct;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.BaseProductDetails
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductMapper.cs
deleted file mode 100644
index c6ac522..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductMapper.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Common.Model;
-using NCC.Order.Entitys.Dto.BaseProduct;
-using Mapster;
-using System.Collections.Generic;
-using NCC.Order.Entitys.Dto.BaseUserBalance;
-
-namespace NCC.Order.Entitys.Mapper.BaseProduct
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-			config.ForType<BaseProductCrInput, BaseProductEntity>()
-				.Map(dest => dest.Images, src => src.images.ToJson())
-			;
-			config.ForType<BaseProductEntity, BaseProductInfoOutput>()
-				.Map(dest => dest.images, src => src.Images.ToObject<List<FileControlsModel>>())
-			;
-			config.ForType<BaseProductEntity, BaseProductListOutput>()
-				.Map(dest => dest.images, src => src.Images.ToObject<List<FileControlsModel>>())
-			;
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseUserBalanceMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseUserBalanceMapper.cs
deleted file mode 100644
index 2511b27..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseUserBalanceMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Order.Entitys.Dto.BaseUserBalance;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.BaseUserBalance
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesDetailMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesDetailMapper.cs
deleted file mode 100644
index eaf54a8..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesDetailMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Order.Entitys.Dto.MarketingRules;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.MarketingRulesDetail
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesMapper.cs
deleted file mode 100644
index 4fd81bd..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesMapper.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NCC.Common.Helper;
-using NCC.Order.Entitys.Dto.MarketingRules;
-using Mapster;
-using System.Collections.Generic;
-
-namespace NCC.Order.Entitys.Mapper.MarketingRules
-{
-	public class Mapper : IRegister
-	{
-		public void Register(TypeAdapterConfig config)
-		{
-		}
-	}
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Model/BaseMateInfoEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Model/BaseMateInfoEntity.cs
deleted file mode 100644
index ec91e84..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Model/BaseMateInfoEntity.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using NCC.Common.Const;
-using SqlSugar;
-using System;
-
-namespace NCC.Frends.Entitys
-{
-    /// <summary>
-    /// 匹配记录
-    /// </summary>
-    [SugarTable("base_mate_info")]
-    [Tenant(ClaimConst.TENANT_ID)]
-    public class BaseMateInfoEntity
-    {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)]
-        public string Id { get; set; }
-        
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Phone")]        
-        public string Phone { get; set; }
-        
-        /// <summary>
-        /// 学历
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Educational")]        
-        public string Educational { get; set; }
-        
-        /// <summary>
-        /// 专业
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Major")]        
-        public string Major { get; set; }
-        
-        /// <summary>
-        /// 性别
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Sex")]        
-        public string Sex { get; set; }
-        
-        /// <summary>
-        /// 年龄
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Age")]        
-        public string Age { get; set; }
-        
-        /// <summary>
-        /// 户籍
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CensusRegister")]        
-        public string CensusRegister { get; set; }
-        
-        /// <summary>
-        /// 意向城市
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IntendedCity")]        
-        public string IntendedCity { get; set; }
-        
-        /// <summary>
-        /// 描述
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Description")]        
-        public string Description { get; set; }
-        
-        /// <summary>
-        /// 匹配时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorTime")]        
-        public DateTime? CreatorTime { get; set; }
-        
-        /// <summary>
-        /// 匹配用户
-        /// </summary>
-        [SugarColumn(ColumnName = "F_CreatorUserId")]        
-        public string CreatorUserId { get; set; }
-        
-        /// <summary>
-        /// 来源
-        /// </summary>
-        [SugarColumn(ColumnName = "F_Source")]        
-        public string Source { get; set; }
-        
-        /// <summary>
-        /// 是否下载
-        /// </summary>
-        [SugarColumn(ColumnName = "F_IsDown")]        
-        public int? IsDown { get; set; }
-        
-        /// <summary>
-        /// 下载时间
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DownTime")]        
-        public DateTime? DownTime { get; set; }
-        
-        /// <summary>
-        /// 下载类型
-        /// </summary>
-        [SugarColumn(ColumnName = "F_DownInfo")]        
-        public string DownInfo { get; set; }
-        
-        /// <summary>
-        /// 订单号
-        /// </summary>
-        [SugarColumn(ColumnName = "F_OrderNo")]        
-        public string OrderNo { get; set; }
-        
-        /// <summary>
-        /// 匹配出的企业数
-        /// </summary>
-        [SugarColumn(ColumnName = "F_MateCount")]        
-        public int? MateCount { get; set; }
-        
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.csproj b/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.csproj
deleted file mode 100644
index a5d29ce..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>D:\wesley\project\git\antis-disk\netcore\src\Modularity\SimpleOrder\NCC.Frends.Entitys\NCC.Frends.Entitys.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\NCC.Common\NCC.Common.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.xml b/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.xml
deleted file mode 100644
index 7b1497e..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.xml
+++ /dev/null
@@ -1,2688 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>NCC.Order.Entitys</name>
-    </assembly>
-    <members>
-        <member name="T:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput">
-            <summary>
-            用户余额变动修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput.userId">
-            <summary>
-            用户ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput.type">
-            <summary>
-            余额变动类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput.sourceId">
-            <summary>
-            订单号或其他来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput.mark">
-            <summary>
-            余额变动描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput.addTime">
-            <summary>
-            变动时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput">
-            <summary>
-            用户余额变动输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput.userId">
-            <summary>
-            用户ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput.type">
-            <summary>
-            余额变动类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput.sourceId">
-            <summary>
-            订单号或其他来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput.mark">
-            <summary>
-            余额变动描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceInfoOutput.addTime">
-            <summary>
-            变动时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput">
-            <summary>
-            用户余额变动输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput.userId">
-            <summary>
-            用户ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput.type">
-            <summary>
-            余额变动类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput.sourceId">
-            <summary>
-            订单号或其他来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput.mark">
-            <summary>
-            余额变动描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListOutput.addTime">
-            <summary>
-            变动时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput">
-            <summary>
-            用户余额变动列表查询输入
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput.selectKey">
-            <summary>
-            选择导出数据key
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput.dataType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput.userId">
-            <summary>
-            用户ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput.type">
-            <summary>
-            余额变动类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput.sourceId">
-            <summary>
-            订单号或其他来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput.addTime">
-            <summary>
-            变动时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceUpInput">
-            <summary>
-            用户余额变动更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput">
-            <summary>
-            金额流水记录修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.money">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.productId">
-            <summary>
-            产品/套餐编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.userId">
-            <summary>
-            用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.payUserId">
-            <summary>
-            消费用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.source">
-            <summary>
-            来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput">
-            <summary>
-            金额流水记录输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.money">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.productId">
-            <summary>
-            产品/套餐编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.orderId">
-            <summary>
-            关联订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.userId">
-            <summary>
-            用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.payUserId">
-            <summary>
-            消费用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.userName">
-            <summary>
-            用户 
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.payUserName">
-            <summary>
-            消费用户 
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.source">
-            <summary>
-            来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.deleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryInfoOutput.deleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput">
-            <summary>
-            金额流水记录输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.money">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.productId">
-            <summary>
-            产品/套餐编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.userId">
-            <summary>
-            用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.payUserId">
-            <summary>
-            消费用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.userName">
-            <summary>
-            用户 
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.payUserName">
-            <summary>
-            消费用户 
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.orderMoney">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.orderId">
-            <summary>
-            订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.source">
-            <summary>
-            来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput">
-            <summary>
-            金额流水记录列表查询输入
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.selectKey">
-            <summary>
-            选择导出数据key
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.dataType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.money">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.productId">
-            <summary>
-            产品/套餐编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.userId">
-            <summary>
-            用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.source">
-            <summary>
-            来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput.myChildren">
-            <summary>
-            我的下级分销记录
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryUpInput">
-            <summary>
-            金额流水记录更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput">
-            <summary>
-            分销规则设置修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.title">
-            <summary>
-            规则名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.withdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.singleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.monthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.description">
-            <summary>
-            规则描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.enabledMark">
-            <summary>
-            是否有效
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.sortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput.marketingRulesDetailList">
-            <summary>
-            营销规则-等级规则
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput">
-            <summary>
-            分销规则设置修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.name">
-            <summary>
-            等级名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.withdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.numberStart">
-            <summary>
-            粉丝量范围-开始
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.singleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.monthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.sortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailCrInput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput">
-            <summary>
-            分销规则设置输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.ruleId">
-            <summary>
-            规则ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.name">
-            <summary>
-            等级名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.withdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.numberStart">
-            <summary>
-            粉丝量范围-开始
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.numberEnd">
-            <summary>
-            粉丝量范围-结束（备用）
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.singleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.monthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.sortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailInfoOutput.fansCount">
-            <summary>
-            粉丝数
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailUpInput">
-            <summary>
-            分销规则设置更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesDetailUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput">
-            <summary>
-            分销规则设置输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.title">
-            <summary>
-            规则名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.withdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.numberStart">
-            <summary>
-            粉丝量范围-开始
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.numberEnd">
-            <summary>
-            粉丝量范围-结束（备用）
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.singleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.monthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.description">
-            <summary>
-            规则描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.enabledMark">
-            <summary>
-            是否有效
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.sortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesInfoOutput.marketingRulesDetailList">
-            <summary>
-            营销规则-等级规则
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput">
-            <summary>
-            分销规则设置输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.title">
-            <summary>
-            规则名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.withdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.singleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.monthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.enabledMark">
-            <summary>
-            是否有效
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.sortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListOutput.details">
-            <summary>
-            营销规则-等级规则
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput">
-            <summary>
-            分销规则设置列表查询输入
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.selectKey">
-            <summary>
-            选择导出数据key
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.dataType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.title">
-            <summary>
-            规则名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.withdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.singleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.monthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput.enabledMark">
-            <summary>
-            是否有效  
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesUpInput">
-            <summary>
-            分销规则设置更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput">
-            <summary>
-            订单模块V1修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput.money">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput.productId">
-            <summary>
-            产品ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput.source">
-            <summary>
-            订单来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput.payType">
-            <summary>
-            支付方式 h5     native = 扫码支付
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput.amount">
-            <summary>
-            数量
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput">
-            <summary>
-            订单模块V1输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.title">
-            <summary>
-            订单标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.orderNumber">
-            <summary>
-            系统订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.orderTime">
-            <summary>
-            下单时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.money">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.productId">
-            <summary>
-            产品ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.status">
-            <summary>
-            订单状态 关联枚举值/数据字典
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.shipStatus">
-            <summary>
-            发货状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.payStatus">
-            <summary>
-            支付状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.sellerId">
-            <summary>
-            商户/店铺/门店ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.confirmStatus">
-            <summary>
-            售后状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.confirmTime">
-            <summary>
-            确认收货时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.point">
-            <summary>
-            使用积分
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.ip">
-            <summary>
-            下单IP
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.mark">
-            <summary>
-            卖家备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.source">
-            <summary>
-            订单来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.payType">
-            <summary>
-            支付方式
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.shipMobile">
-            <summary>
-            收货电话
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.shipName">
-            <summary>
-            收货人姓名
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.shipAddress">
-            <summary>
-            收货详细地址
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.shipArea">
-            <summary>
-            收货地区
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.thirdPartyOrderNo">
-            <summary>
-            三方订单号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.deleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.deleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderInfoOutput.product">
-            <summary>
-            产品信息
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput">
-            <summary>
-            订单模块V1输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.title">
-            <summary>
-            订单标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.orderNumber">
-            <summary>
-            系统订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.orderTime">
-            <summary>
-            下单时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.amount">
-            <summary>
-            数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.money">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.productId">
-            <summary>
-            产品ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.productName">
-            <summary>
-            产品名字
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.status">
-            <summary>
-            订单状态 关联枚举值/数据字典
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.statusName">
-            <summary>
-            状态说明
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.ip">
-            <summary>
-            下单IP
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.mark">
-            <summary>
-            卖家备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.source">
-            <summary>
-            订单来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.payType">
-            <summary>
-            支付方式
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.thirdPartyOrderNo">
-            <summary>
-            三方订单号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.productTitle">
-            <summary>
-            商品标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.userFullName">
-            <summary>
-            下单用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.businessName">
-            <summary>
-            商家名
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.images">
-            <summary>
-            商品图片集合
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.phone">
-            <summary>
-            手机号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListOutput.imagelist">
-            <summary>
-            商品图片集合
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput">
-            <summary>
-            订单模块V1列表查询输入
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.selectKey">
-            <summary>
-            选择导出数据key
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.dataType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.title">
-            <summary>
-            订单标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.orderNumber">
-            <summary>
-            系统订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.orderTime">
-            <summary>
-            下单时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.money">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.status">
-            <summary>
-            订单状态 关联枚举值/数据字典
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.mark">
-            <summary>
-            卖家备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.payType">
-            <summary>
-            支付方式
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult">
-            <summary>
-            下单返回
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.title">
-            <summary>
-            订单标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.orderNumber">
-            <summary>
-            系统订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.orderTime">
-            <summary>
-            下单时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.money">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.productId">
-            <summary>
-            产品ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.openId">
-            <summary>
-            openid
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUnOrderResult.qrCode">
-            <summary>
-            二维码 base64
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUpInput">
-            <summary>
-            订单模块V1更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput">
-            <summary>
-            产品信息V1修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.title">
-            <summary>
-            产品名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.validStart">
-            <summary>
-            有效期开始时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.validEnd">
-            <summary>
-            有效期结束时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.price">
-            <summary>
-            金额/单价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.originalPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.discount">
-            <summary>
-            折扣
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.images">
-            <summary>
-            图片集合
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.tags">
-            <summary>
-            标签
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.baseProductDetailsList">
-            <summary>
-            商品详情
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.BusinessId">
-            <summary>
-            商家ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.year">
-            <summary>
-            年
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.volume">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput.type">
-            <summary>
-            产品类型
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsCrInput">
-            <summary>
-            产品信息V1修改输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsCrInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsCrInput.title">
-            <summary>
-            标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsCrInput.isUseCoupo">
-            <summary>
-            是否能使用优惠券
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsCrInput.price">
-            <summary>
-            价格
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsCrInput.orgPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput">
-            <summary>
-            产品信息V1输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.productId">
-            <summary>
-            关联商品
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.title">
-            <summary>
-            标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.isUseCoupo">
-            <summary>
-            是否能使用优惠券
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.price">
-            <summary>
-            价格
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.orgPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.sortCode">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsInfoOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsUpInput">
-            <summary>
-            产品信息V1更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductDetailsUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput">
-            <summary>
-            产品信息V1输出参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.title">
-            <summary>
-            产品名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.validStart">
-            <summary>
-            有效期开始时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.validEnd">
-            <summary>
-            有效期结束时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.price">
-            <summary>
-            金额/单价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.originalPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.discount">
-            <summary>
-            折扣
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.discountPrice">
-            <summary>
-            折后价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.store">
-            <summary>
-            门店
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.longitude">
-            <summary>
-            经度
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.latitude">
-            <summary>
-            纬度
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.thumbnail">
-            <summary>
-            缩略图
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.images">
-            <summary>
-            图片集合
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.manImage">
-            <summary>
-            主图
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.type">
-            <summary>
-            产品类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.deleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.deleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.sortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.tags">
-            <summary>
-            标签
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.remark">
-            <summary>
-            商品描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.status">
-            <summary>
-            产品状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.baseProductDetailsList">
-            <summary>
-            商品详情
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.F_BusinessId">
-            <summary>
-            商家ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.year">
-            <summary>
-            年
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductInfoOutput.volume">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput">
-            <summary>
-            产品信息V1输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.title">
-            <summary>
-            产品名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.validStart">
-            <summary>
-            有效期开始时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.validEnd">
-            <summary>
-            有效期结束时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.price">
-            <summary>
-            金额/单价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.originalPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.discount">
-            <summary>
-            折扣
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.creatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.lastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.lastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.tags">
-            <summary>
-            标签
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.creatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.images">
-            <summary>
-            图片集合
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.imagelist">
-            <summary>
-            图片集合
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.F_BusinessId">
-            <summary>
-            商家ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.year">
-            <summary>
-            年
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.volume">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListOutput.type">
-            <summary>
-            产品类型
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput">
-            <summary>
-            产品信息V1列表查询输入
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.selectKey">
-            <summary>
-            选择导出数据key
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.dataType">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.title">
-            <summary>
-            产品名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.validStart">
-            <summary>
-            有效期开始时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.validEnd">
-            <summary>
-            有效期结束时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.price">
-            <summary>
-            金额/单价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.originalPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.tags">
-            <summary>
-            标签
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.BusinessId">
-            <summary>
-            商家ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput.type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.Dto.BaseProduct.BaseProductUpInput">
-            <summary>
-            产品信息V1更新输入参数
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.Dto.BaseProduct.BaseProductUpInput.id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseAmountHistoryEntity">
-            <summary>
-            金额流水记录
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.Money">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.ProductId">
-            <summary>
-            产品/套餐编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.OrderId">
-            <summary>
-            关联订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.UserId">
-            <summary>
-            用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.PayUserId">
-            <summary>
-            消费用户编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.Source">
-            <summary>
-            来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.DeleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseAmountHistoryEntity.DeleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseBusinessEntity">
-            <summary>
-            商家信息
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.SortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.CreatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.DeleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.DeleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.EnabledMark">
-            <summary>
-            有效标志
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.LastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.LastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Name">
-            <summary>
-            商家名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Phone">
-            <summary>
-            联系电话
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Tags">
-            <summary>
-            标签
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Images">
-            <summary>
-            图片
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Adress">
-            <summary>
-            地址
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Longitude">
-            <summary>
-            经度
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Latitude">
-            <summary>
-            维度
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Area">
-            <summary>
-            区域，省市
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Logo">
-            <summary>
-            商家Logo
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.AvgPrice">
-            <summary>
-            均价/人
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.BusinessHours">
-            <summary>
-            营业时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.ReUserId">
-            <summary>
-            关联用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.Category">
-            <summary>
-            商家分类
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseBusinessEntity.HomeTop">
-            <summary>
-            是否首页置顶
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseMyCouponEntity">
-            <summary>
-            优惠券记录
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.ProductId">
-            <summary>
-            我的优惠券
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.OrderId">
-            <summary>
-            订单ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.CoupnCode">
-            <summary>
-            券码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.QrCode">
-            <summary>
-            二维码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.UserId">
-            <summary>
-            用户ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.IsUsed">
-            <summary>
-            是否使用
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.UsedId">
-            <summary>
-            使用商品ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.StartTime">
-            <summary>
-            有效开始时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.EndTime">
-            <summary>
-            有效结束时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.TotalMoney">
-            <summary>
-            总金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.UsedMoney">
-            <summary>
-            使用金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseMyCouponEntity.OverMoney">
-            <summary>
-            剩余金额
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseOrderEntity">
-            <summary>
-            订单模块V1
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Title">
-            <summary>
-            订单标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.OrderNumber">
-            <summary>
-            系统订单编号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.OrderTime">
-            <summary>
-            下单时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Money">
-            <summary>
-            订单金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ProductId">
-            <summary>
-            产品ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Status">
-            <summary>
-            订单状态 关联枚举值/数据字典
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ShipStatus">
-            <summary>
-            发货状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.PayStatus">
-            <summary>
-            支付状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.SellerId">
-            <summary>
-            商户/店铺/门店ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ConfirmStatus">
-            <summary>
-            售后状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ConfirmTime">
-            <summary>
-            确认收货时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Point">
-            <summary>
-            使用积分
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Ip">
-            <summary>
-            下单IP
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Mark">
-            <summary>
-            卖家备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Source">
-            <summary>
-            订单来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.PayType">
-            <summary>
-            支付方式
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ShipMobile">
-            <summary>
-            收货电话
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ShipName">
-            <summary>
-            收货人姓名
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ShipAddress">
-            <summary>
-            收货详细地址
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ShipArea">
-            <summary>
-            收货地区
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.ThirdPartyOrderNo">
-            <summary>
-            三方订单号
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.CreatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.LastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.LastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.DeleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.DeleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.OpenId">
-            <summary>
-            wx openid
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Price">
-            <summary>
-            单价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseOrderEntity.Amount">
-            <summary>
-            数量
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseProductDetailsEntity">
-            <summary>
-            产品信息
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.ProductId">
-            <summary>
-            关联商品
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.Title">
-            <summary>
-            标题
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.Type">
-            <summary>
-            类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.IsUseCoupo">
-            <summary>
-            是否能使用优惠券
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.Price">
-            <summary>
-            价格
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.OrgPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.SortCode">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.CreatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductDetailsEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseProductEntity">
-            <summary>
-            产品信息V1
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Title">
-            <summary>
-            产品名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.ValidStart">
-            <summary>
-            有效期开始时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.ValidEnd">
-            <summary>
-            有效期结束时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Price">
-            <summary>
-            金额/单价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.OriginalPrice">
-            <summary>
-            原价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Discount">
-            <summary>
-            折扣
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.DiscountPrice">
-            <summary>
-            折后价
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Store">
-            <summary>
-            门店
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Longitude">
-            <summary>
-            经度
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Latitude">
-            <summary>
-            纬度
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Thumbnail">
-            <summary>
-            缩略图
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Images">
-            <summary>
-            图片集合
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.ManImage">
-            <summary>
-            主图
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Type">
-            <summary>
-            产品类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.DeleteUserId">
-            <summary>
-            删除用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.LastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.LastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.DeleteTime">
-            <summary>
-            删除时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.SortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Tags">
-            <summary>
-            标签
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Remark">
-            <summary>
-            商品描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Status">
-            <summary>
-            产品状态
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.CreatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.BusinessId">
-            <summary>
-            商家ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Visit">
-            <summary>
-            查看量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.volume">
-            <summary>
-            容量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseProductEntity.Year">
-            <summary>
-            有效期-年
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.BaseUserBalanceEntity">
-            <summary>
-            用户余额变动
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseUserBalanceEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseUserBalanceEntity.UserId">
-            <summary>
-            用户ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseUserBalanceEntity.Type">
-            <summary>
-            余额变动类型
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseUserBalanceEntity.SourceId">
-            <summary>
-            订单号或其他来源
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseUserBalanceEntity.Mark">
-            <summary>
-            余额变动描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.BaseUserBalanceEntity.AddTime">
-            <summary>
-            变动时间
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.MarketingRulesDetailEntity">
-            <summary>
-            分销规则设置
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.RuleId">
-            <summary>
-            规则ID
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.Name">
-            <summary>
-            等级名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.Proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.WithdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.NumberStart">
-            <summary>
-            粉丝量范围-开始
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.NumberEnd">
-            <summary>
-            粉丝量范围-结束（备用）
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.SingleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.MonthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.SortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesDetailEntity.Description">
-            <summary>
-            描述
-            </summary>
-        </member>
-        <member name="T:NCC.Order.Entitys.MarketingRulesEntity">
-            <summary>
-            分销规则设置
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.Title">
-            <summary>
-            规则名称
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.Proportion">
-            <summary>
-            提成比例
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.WithdrawalMoney">
-            <summary>
-            满多少能提现
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.NumberStart">
-            <summary>
-            粉丝量范围-开始
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.NumberEnd">
-            <summary>
-            粉丝量范围-结束（备用）
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.SingleMaxWithdrawalAmount">
-            <summary>
-            单次最大提现金额
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.MonthWithdrawalCount">
-            <summary>
-            每个月能提现的数量
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.Description">
-            <summary>
-            规则描述
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.EnabledMark">
-            <summary>
-            是否有效
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.SortCode">
-            <summary>
-            排序码
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.CreatorTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.CreatorUserId">
-            <summary>
-            创建用户
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.LastModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:NCC.Order.Entitys.MarketingRulesEntity.LastModifyUserId">
-            <summary>
-            修改用户
-            </summary>
-        </member>
-        <member name="F:NCC.Order.Entitys.Enum.OrderStatus.No">
-            <summary>
-            订单正常
-            </summary>
-        </member>
-        <member name="F:NCC.Order.Entitys.Enum.OrderStatus.Yes">
-            <summary>
-            已支付
-            </summary>
-        </member>
-        <member name="F:NCC.Order.Entitys.Enum.OrderStatus.Cancel">
-            <summary>
-            订单取消
-            </summary>
-        </member>
-        <member name="F:NCC.Order.Entitys.Enum.OrderStatus.PartialNo">
-            <summary>
-            部分退款
-            </summary>
-        </member>
-        <member name="F:NCC.Order.Entitys.Enum.OrderStatus.Refunded">
-            <summary>
-            已退款
-            </summary>
-        </member>
-        <member name="F:NCC.Order.Entitys.Enum.OrderStatus.End">
-            <summary>
-            已完成
-            </summary>
-        </member>
-        <member name="T:NCC.Food.Entitys.Enum.MoneyHistoryType">
-            <summary>
-            资金类型
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.MoneyHistoryType.未知">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.MoneyHistoryType.分销提成">
-            <summary>
-            分销提成
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.MoneyHistoryType.余额消费">
-            <summary>
-            余额消费
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.MoneyHistoryType.提现">
-            <summary>
-            提现
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.MoneyHistoryType.消费">
-            <summary>
-            消费
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.MoneyHistoryType.退款">
-            <summary>
-            退款
-            </summary>
-        </member>
-        <member name="T:NCC.Food.Entitys.Enum.PriceStatus">
-            <summary>
-            金额状态枚举
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.PriceStatus.可用">
-            <summary>
-            可用
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.PriceStatus.锁定">
-            <summary>
-            锁定
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.PriceStatus.冻结">
-            <summary>
-            冻结
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.PriceStatus.无效">
-            <summary>
-            无效
-            </summary>
-        </member>
-        <member name="F:NCC.Food.Entitys.Enum.PriceStatus.其他">
-            <summary>
-            其他
-            </summary>
-        </member>
-    </members>
-</doc>
diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseAmountHistoryService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseAmountHistoryService.cs
deleted file mode 100644
index 88591a6..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseAmountHistoryService.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-
-namespace NCC.Order.Interfaces.BaseAmountHistory
-{
-    public interface IBaseAmountHistoryService
-    {
-        /// <summary>
-        /// 订单分销金额计算 还需要完善 
-        /// </summary>
-        /// <param name="orderId"></param>
-        /// <returns></returns>
-        Task DistributionAccount(string orderId);
-
-        /// <summary>
-        /// 订单 匹配次数增加
-        /// </summary>
-        /// <param name="orderId"></param>
-        /// <returns></returns>
-       Task UserMatchCountAccount(string orderId);
-
-        /// <summary>
-        /// 获取当前用户所有剩余匹配次数  
-        /// </summary>
-        /// <returns></returns> 
-         int GetMatchOverCount();
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseOrderService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseOrderService.cs
deleted file mode 100644
index 393aa24..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseOrderService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using NCC.Order.Entitys.Dto.BaseOrder;
-using System.Threading.Tasks;
-
-namespace NCC.Order.Interfaces.BaseOrder
-{
-    public interface IBaseOrderService
-    {
-        /// <summary>
-        /// 获取订单模块
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        Task<BaseOrderInfoOutput> GetInfo(string id);
-
-        /// <summary>
-        /// 扣减用户匹配次数  
-        /// </summary>
-        /// <returns></returns>
-        Task<bool> DeductionCount(string userId, int matchCount = 1);
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseProductService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseProductService.cs
deleted file mode 100644
index 6e9d187..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseProductService.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using NCC.Order.Entitys;
-using System.Threading.Tasks;
-
-namespace NCC.Order.Interfaces.BaseProduct
-{
-    public interface IBaseProductService
-    {
-        /// <summary>
-        /// 获取单个产品详情
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="view"></param>
-        /// <returns></returns>
-        Task<dynamic> GetInfo(string id, bool view = false);
-
-
-        Task<BaseProductEntity> GetEntity(string id);
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseUserBalanceService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseUserBalanceService.cs
deleted file mode 100644
index 08a3e1f..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseUserBalanceService.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace NCC.Order.Interfaces.BaseUserBalance
-{
-    public interface IBaseUserBalanceService
-    {
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IMarketingRulesService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IMarketingRulesService.cs
deleted file mode 100644
index 5a6a51b..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IMarketingRulesService.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using NCC.Order.Entitys.Dto.MarketingRules;
-using System.Threading.Tasks;
-
-namespace NCC.Order.Interfaces.MarketingRules
-{
-    public interface IMarketingRulesService
-    {
-        /// <summary>
-        /// 获取正在用的规则 (取一个)
-        /// </summary> 
-        /// <returns></returns>
-        Task<MarketingRulesInfoOutput> CurrentRule();
-        /// <summary>
-        /// 获取当前用户等级信息
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        Task<MarketingRulesDetailInfoOutput> GetUserRule(string userId="");
-    }
-}
\ No newline at end of file
diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/NCC.Order.Interfaces.csproj b/netcore/src/Modularity/Order/NCC.Order.Interfaces/NCC.Order.Interfaces.csproj
deleted file mode 100644
index e07ebda..0000000
--- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/NCC.Order.Interfaces.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\NCC.Order.Entitys\NCC.Order.Entitys.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseAmountHistoryService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseAmountHistoryService.cs
deleted file mode 100644
index 50754db..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/BaseAmountHistoryService.cs
+++ /dev/null
@@ -1,490 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Order.Interfaces.BaseAmountHistory;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Order.Entitys;
-using NCC.Order.Entitys.Dto.BaseAmountHistory;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.System.Interfaces.System;
-using NCC.Food.Entitys.Enum;
-using NCC.Order.Interfaces.MarketingRules;
-using NCC.Order.Interfaces.BaseOrder;
-using Serilog;
-using Antis.Pay.Core.Interface;
-using NCC.System.Entitys.Permission;
-using NCC.Core.Pay.WeChatPay.V2.Request;
-using NCC.Core.Pay.WeChatPay.V2;
-using NCC.Core.Pay.WeChatPay;
-using Microsoft.Extensions.Options;
-using NPOI.POIFS.Properties;
-
-namespace NCC.Order.BaseAmountHistory
-{
-    /// <summary>
-    /// 金额流水记录服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "订单流水", Name = "BaseAmountHistory", Order = 200)]
-    [Route("api/Order/[controller]")]
-    public class BaseAmountHistoryService : IBaseAmountHistoryService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<BaseAmountHistoryEntity> _baseAmountHistoryRepository;
-        private readonly IDbLinkService _dbLinkService;
-        private readonly IDataBaseService _dataBaseService;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-        private readonly IWePay _wepay;
-
-        private readonly IWeChatPayClient _client;
-        private readonly IOptions<WeChatPayOptions> _optionsAccessor;
-        /// <summary>
-        /// 初始化一个<see cref="BaseAmountHistoryService"/>类型的新实例
-        /// </summary>
-        public BaseAmountHistoryService(
-            ISqlSugarRepository<BaseAmountHistoryEntity> baseAmountHistoryRepository,
-            IDbLinkService dbLinkService,
-            IDataBaseService dataBaseService,
-            IUserManager userManager,
-            IWePay wepay,
-            IWeChatPayClient client,
-            IOptions<WeChatPayOptions> optionsAccessor)
-        {
-            _baseAmountHistoryRepository = baseAmountHistoryRepository;
-            _db = _baseAmountHistoryRepository.Context;
-            _dbLinkService = dbLinkService;
-            _dataBaseService = dataBaseService;
-            _userManager = userManager;
-            _wepay = wepay;
-            _client = client;
-            _optionsAccessor = optionsAccessor;
-        }
-
-        /// <summary>
-        /// 获取金额流水记录
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseAmountHistoryEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<BaseAmountHistoryInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-		/// 获取金额流水记录列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] BaseAmountHistoryListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "id" : input.sidx;
-            List<string> queryCreatorTime = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.First()) : null;
-            DateTime? endCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.Last()) : null;
-            var data = await _db.Queryable<BaseAmountHistoryEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.money), p => p.Money.Equals(input.money))
-                .WhereIF(!string.IsNullOrEmpty(input.productId), p => p.ProductId.Contains(input.productId))
-                .WhereIF(!string.IsNullOrEmpty(input.userId), p => p.UserId.Contains(input.userId))
-                .WhereIF(!string.IsNullOrEmpty(input.source), p => p.Source.Contains(input.source))
-                .WhereIF(!string.IsNullOrEmpty(input.status), p => p.Status.Equals(input.status))
-                .WhereIF(queryCreatorTime != null, p => p.CreatorTime >= new DateTime(startCreatorTime.ToDate().Year, startCreatorTime.ToDate().Month, startCreatorTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryCreatorTime != null, p => p.CreatorTime <= new DateTime(endCreatorTime.ToDate().Year, endCreatorTime.ToDate().Month, endCreatorTime.ToDate().Day, 23, 59, 59))
-                //.WhereIF(input.myChildren != null && input.myChildren.Value, p =>
-                //p.Source == SqlFunc.ToString(MoneyHistoryType.分销提成.ToString())
-
-                //&& SqlFunc.Subqueryable<UserEntity>().Where(o => o.ParentId == _userManager.UserId && o.Id == p.PayUserId).Any())
-                .Select(p => new BaseAmountHistoryListOutput
-                {
-                    id = p.Id,
-                    money = p.Money,
-                    productId = p.ProductId,
-                    userId = p.UserId,
-                    source = p.Source,
-                    status = p.Status,
-                    creatorTime = p.CreatorTime,
-                    payUserId = p.PayUserId,
-                    orderId = p.OrderId,
-                    orderMoney = SqlFunc.Subqueryable<BaseOrderEntity>().Where(od => od.Id == p.OrderId).Select(o => o.Money),
-                    payUserName = SqlFunc.Subqueryable<UserEntity>().Where(o => o.Id == p.PayUserId).Select(o => o.RealName),
-                    userName = SqlFunc.Subqueryable<UserEntity>().Where(o => o.Id == p.UserId).Select(o => o.RealName)
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-            return PageResult<BaseAmountHistoryListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建金额流水记录
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] BaseAmountHistoryCrInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<BaseAmountHistoryEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            entity.CreatorTime = DateTime.Now;
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-        /// 更新金额流水记录
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        [NonAction]
-        public async Task Update(string id, [FromBody] BaseAmountHistoryUpInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = input.Adapt<BaseAmountHistoryEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除金额流水记录
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        [NonAction]
-        public async Task Delete(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseAmountHistoryEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<BaseAmountHistoryEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-
-        /// <summary>
-        /// 获取当前用户所有余额  
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("userAmount")]
-        public decimal GetUserAmount()
-        {
-            string UserId = _userManager.UserId;
-            return _db.Queryable<BaseAmountHistoryEntity>()
-                      .Where(u =>
-                             u.UserId == UserId
-                             && u.Status == PriceStatus.可用.GetHashCode()
-                             && u.Source != MoneyHistoryType.消费.ToString()
-                             && u.Source != MoneyHistoryType.退款.ToString()
-            ).Sum(u => u.Money);
-        }
-        /// <summary>
-        /// 获取当前用户所有剩余匹配次数  
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("GetMatchOverCount")]
-        public int GetMatchOverCount()
-        {
-            try
-            {
-                string UserId = _userManager.UserId;
-                return decimal.ToInt32(_db.Queryable<BaseAmountHistoryEntity>()
-                          .Where(u =>
-                                 u.UserId == UserId
-                                 && u.Status == PriceStatus.可用.GetHashCode()
-                                 && u.Source == MoneyHistoryType.匹配次数.ToString()
-
-                ).Sum(u => u.Money));
-            }
-            catch (Exception)
-            {
-                return 0;
-            }
-        }
-
-
-        [HttpPost("transtest")]
-        public async Task<object> transtest(int money = 1)
-        {
-            var user = _db.Queryable<UserEntity>().First(o => o.Id == _userManager.UserId);
-            string orderid = YitIdHelper.NextId().ToString();
-            var request = new WeChatPayPromotionTransfersRequest
-            {
-                PartnerTradeNo = orderid,
-                OpenId = user.OpenId,
-                CheckName = "NO_CHECK",
-                ReUserName = user.OpenId,
-                Amount = money,
-                Desc = "测试提现",
-                SpBillCreateIp = ""
-            };
-            return await _client.ExecuteAsync(request, _optionsAccessor.Value);
-        }
-
-        /// <summary>
-        /// 提现 
-        /// </summary>
-        /// <param name="money">提现金额</param>
-        /// <returns></returns>
-        [HttpGet("Withdrawal")]
-        public async Task Withdrawal(decimal money)
-        {
-            var user = _db.Queryable<UserEntity>().First(o => o.Id == _userManager.UserId);
-            if (user == null) throw NCCException.Oh("用户信息拉取失败！");
-            var cmoney = GetUserAmount();
-            if (cmoney < money) throw NCCException.Oh("提现金额超过余额！");
-            _db.BeginTran();
-            try
-            {
-                string wid = YitIdHelper.NextId().ToString();
-                string orderid = YitIdHelper.NextId().ToString();
-                string? transfer = null;
-                //.......
-                //增加余额提现
-                await _db.Insertable(new BaseAmountHistoryEntity()
-                {
-                    CreatorTime = DateTime.Now,
-                    Id = wid,
-                    Money = -money,
-                    OrderId = orderid,
-                    ProductId = "",
-                    Source = MoneyHistoryType.提现.ToString(),
-                    Status = PriceStatus.可用.GetHashCode(),
-                    UserId = _userManager.UserId,
-                }).ExecuteCommandAsync();
-
-
-                //后面测试在做验证
-                if (transfer == null)
-                {
-                    _db.RollbackTran();
-                    throw NCCException.Oh("发起提现失败！");
-                }
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                _db.RollbackTran();
-            }
-
-
-        }
-
-
-        /// <summary>
-        /// 代理星球首页信息
-        /// </summary>
-        /// <returns>percentageScale 提成比例  myFans 我的粉丝   balance  余额 </returns>
-        [HttpGet("homeStatistics")]
-        public async Task<dynamic> HomeStatistics()
-        {
-            var rule = await App.GetService<IMarketingRulesService>().GetUserRule();
-
-            decimal percentageScale = 0;
-            decimal myFans = 0;
-            decimal balance = GetUserAmount();
-            if (rule != null)
-            {
-                myFans = rule.fansCount;
-                percentageScale = rule.proportion;
-
-            }
-            return new
-            {
-                percentageScale,
-                myFans,
-                balance
-            };
-        }
-        /// <summary>
-        /// 订单 匹配次数增加
-        /// </summary>
-        /// <param name="orderId"></param>
-        /// <returns></returns>
-        [HttpPost("UserMatchCountAccount")]
-        public async Task UserMatchCountAccount(string orderId)
-        {
-
-            try
-            {
-                var order = _db.Queryable<BaseOrderEntity>().Where(o => o.Id == orderId).First();// await App.GetService<IBaseOrderService>().GetInfo(orderId);
-                if (order == null)
-                {
-                    Log.Information($"订单 {orderId} 不存在！");
-                    return;
-                }
-
-                if (_db.Queryable<BaseAmountHistoryEntity>()
-                  .Where(u =>
-                         u.OrderId == orderId
-                         && u.Status == PriceStatus.可用.GetHashCode()
-                         && u.Source == MoneyHistoryType.匹配次数.ToString()).Any())
-                {
-                    Log.Information($"订单 {orderId} 已处理过！");
-                    return;
-                }
-                var product = _db.Queryable<BaseProductEntity>().Where(o => o.Id == order.ProductId).First();
-                if (product != null && product.Discount > 0)
-                {
-                    List<BaseAmountHistoryEntity> list = new List<BaseAmountHistoryEntity>();
-                    for (int i = 0; i < product.Discount; i++)
-                    {
-                        //增加次数
-                        list.Add(new BaseAmountHistoryEntity()
-                        {
-                            CreatorTime = DateTime.Now,
-                            Id = YitIdHelper.NextId().ToString(),
-                            Money = 1,
-                            OrderId = order.Id,
-                            ProductId = order.ProductId,
-                            Source = MoneyHistoryType.匹配次数.ToString(),
-                            Status = PriceStatus.可用.GetHashCode(),
-                            UserId = order.CreatorUserId,
-                            PayUserId = order.CreatorUserId,
-                            ValidStart = product.ValidStart,
-                            ValidEnd = product.ValidEnd,
-                        });//.ExecuteCommandAsync();
-                    }
-                    await _db.Insertable(list).ExecuteCommandAsync();
-
-                }
-                else
-                {
-                    Log.Information($" 匹配次数计算未进行");
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Information($"匹配次数计算异常 原因 :{ex.Message}");
-            }
-        }
-
-        /// <summary>
-        /// 订单分销金额计算 还需要完善 分销的条件 不应该是所有人都能
-        /// </summary>
-        /// <param name="orderId"></param>
-        /// <returns></returns>
-        public async Task DistributionAccount(string orderId)
-        {
-            return;
-            //try
-            //{
-            //    var order = _db.Queryable<BaseOrderEntity>().Where(o => o.Id == orderId).First();// await App.GetService<IBaseOrderService>().GetInfo(orderId);
-            //    if (order == null)
-            //    {
-            //        Log.Information($"订单 {orderId} 不存在！");
-            //        return;
-            //    }
-            //    var parentId = _db.Queryable<UserEntity>().Where(o => o.Id == order.CreatorUserId).Select(o => o.ParentId).First();
-
-            //    if (parentId.IsNullOrEmpty())
-            //    {
-            //        Log.Information($"订单 {orderId}下单用户不是分销成员不进行分销！");
-            //        return;
-            //    }
-            //    Log.Information($"订单 {orderId}  开始计算分销提成！");
-            //    var rule = await App.GetService<IMarketingRulesService>().GetUserRule(parentId);
-
-            //    if (order != null && rule != null && rule.proportion > 0)
-            //    {
-            //        decimal money = order.Money;
-            //        money = (rule.proportion / 100) * money; //得到百分比的分销提成
-            //        if (_db.Queryable<BaseAmountHistoryEntity>().Where(o => o.OrderId == order.Id && o.Source == MoneyHistoryType.分销提成.ToString()).Any())
-            //        {
-            //            Log.Information($"订单 {order.Id} 已进行过分销不在进行处理！");
-            //        }
-            //        else if (money <= 0)
-            //        {
-            //            Log.Information($"订单 {order.Id} 分销得到的金额小于等于0  不进行分销 金额= {money} ");
-
-            //        }
-            //        else
-            //        {
-            //            //增加余额
-            //            await _db.Insertable(new BaseAmountHistoryEntity()
-            //            {
-            //                CreatorTime = DateTime.Now,
-            //                Id = YitIdHelper.NextId().ToString(),
-            //                Money = money,
-            //                OrderId = order.Id,
-            //                ProductId = order.ProductId,
-            //                Source = MoneyHistoryType.分销提成.ToString(),
-            //                Status = PriceStatus.可用.GetHashCode(),
-            //                UserId = parentId,
-            //                PayUserId = order.CreatorUserId
-            //            }).ExecuteCommandAsync();
-            //        }
-
-            //    }
-            //    else
-            //    {
-            //        Log.Information($"分销未进行");
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    Log.Information($"分销异常 原因 :{ex.Message}");
-            //}
-        }
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseOrderService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseOrderService.cs
deleted file mode 100644
index bf403f8..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/BaseOrderService.cs
+++ /dev/null
@@ -1,910 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Order.Interfaces.BaseOrder;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Order.Entitys;
-using NCC.Order.Entitys.Dto.BaseOrder;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-using NCC.System.Interfaces.System;
-using Antis.Pay.Core.Interface;
-using Antis.Pay.Core.Model;
-using Microsoft.AspNetCore.Mvc;
-using Serilog;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Authorization;
-using NCC.System.Entitys.Permission;
-using Microsoft.Extensions.Logging;
-using NCC.Common.Extensions;
-using NCC.EventBridge;
-using NCC.Order.Interfaces.BaseProduct;
-using NCC.Code.QrCode;
-using NCC.Order.Entitys.Dto.BaseProduct;
-using NCC.Order.Interfaces.BaseAmountHistory;
-using NCC.Core.Pay.WeChatPay.V2.Request;
-using NCC.Core.Pay.WeChatPay.V2;
-using NCC.Core.Pay.WeChatPay;
-using Microsoft.Extensions.Options;
-using NCC.Core.Pay.WeChatPay.V2.Notify;
-using NCC.Food.Entitys.Enum;
-using NCC.Frends.Entitys;
-using Spire.Presentation;
-using NCC.System.Entitys.Model.Permission.User;
-
-namespace NCC.Order.BaseOrder
-{
-    /// <summary>
-    /// 订单模块服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "订单模块", Name = "BaseOrder", Order = 200)]
-    [Route("api/Order/[controller]")]
-    public class BaseOrderService : IBaseOrderService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<BaseOrderEntity> _baseOrderRepository;
-        private readonly IDbLinkService _dbLinkService;
-        private readonly IDataBaseService _dataBaseService;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-        private readonly IWePay _wepay;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly ILogger<BaseOrderEntity> _logger;
-        private readonly IBaseProductService _iProductService;
-        private readonly IWeChatPayNotifyClient _notifylient;
-        private readonly IWeChatPayClient _client;
-        private readonly IOptions<WeChatPayOptions> _optionsAccessor;
-        /// <summary>
-        /// 初始化一个<see cref="BaseOrderService"/>类型的新实例
-        /// </summary>
-        public BaseOrderService(
-            ISqlSugarRepository<BaseOrderEntity> baseOrderRepository,
-            IDbLinkService dbLinkService,
-            IDataBaseService dataBaseService,
-            IUserManager userManager,
-            IWePay wePay,
-            IHttpContextAccessor httpContextAccessor,
-            ILogger<BaseOrderEntity> logger
-, IBaseProductService iProductService,
-IWeChatPayNotifyClient notifylient,
-IWeChatPayClient client,
-IOptions<WeChatPayOptions> optionsAccessor)
-        {
-            _baseOrderRepository = baseOrderRepository;
-            _db = _baseOrderRepository.Context;
-            _dbLinkService = dbLinkService;
-            _dataBaseService = dataBaseService;
-            _userManager = userManager;
-            _wepay = wePay;
-            _httpContextAccessor = httpContextAccessor;
-            _logger = logger;
-            _iProductService = iProductService;
-            _notifylient = notifylient;
-            _client = client;
-            _optionsAccessor = optionsAccessor;
-        }
-
-        /// <summary>
-        /// 获取订单模块
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<BaseOrderInfoOutput> GetInfo(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseOrderEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<BaseOrderInfoOutput>();
-            output.product = _iProductService.GetInfo(output.productId).GetAwaiter().GetResult();
-            //output.coupon =   _db.Queryable<BaseMyCouponEntity>().FirstAsync(o => o.OrderId == entity.Id).Adapt<BaseMyCouponInfoOutput>();
-            return output;
-        }
-        /// <summary>
-        /// 检测订单是否支付
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [HttpGet("CheckOrderPay")]
-        public async Task<dynamic> CheckOrderPay(string id)
-        {
-            var isOk = await _db.Queryable<BaseOrderEntity>().AnyAsync(p => p.Id == id && p.PayStatus == Entitys.Enum.OrderStatus.Yes.GetHashCode());
-
-            if (isOk)
-            {
-                return await GetInfo(id);
-            }
-            return false;
-        }
-        /// <summary>
-        /// 获取订单模块列表
-        /// </summary>
-        /// <param name="input">请求参数</param>
-        /// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] BaseOrderListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var user = await _userManager.GetUserInfo();
-            var sidx = input.sidx == null ? "orderTime" : input.sidx;
-            List<string> queryOrderTime = input.orderTime != null ? input.orderTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.First()) : null;
-            DateTime? endOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.Last()) : null;
-            var data = await _db.Queryable<BaseOrderEntity, UserEntity, BaseProductEntity>((p, u, pd) =>
-                     p.ProductId == pd.Id && p.CreatorUserId == u.Id)
-                .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title))
-                .WhereIF(!string.IsNullOrEmpty(input.orderNumber), p => p.OrderNumber.Contains(input.orderNumber))
-                .WhereIF(queryOrderTime != null, p => p.OrderTime >= new DateTime(startOrderTime.ToDate().Year, startOrderTime.ToDate().Month, startOrderTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryOrderTime != null, p => p.OrderTime <= new DateTime(endOrderTime.ToDate().Year, endOrderTime.ToDate().Month, endOrderTime.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.money), p => p.Money.Equals(input.money))
-                .WhereIF(!input.status.IsNullOrEmpty(), p => p.Status.Equals(input.status))
-                .WhereIF(!string.IsNullOrEmpty(input.mark), p => p.Mark.Contains(input.mark))
-                .WhereIF(!string.IsNullOrEmpty(input.payType), p => p.PayType.Contains(input.payType))
-                .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId))
-                //.WhereIF(!PubUserEx.AdminUsers.Contains(user.userAccount), p => p.CreatorUserId == user.userId)
-
-                .Select((p, u, pd) => new BaseOrderListOutput
-                {
-                    id = p.Id,
-                    title = p.Title,
-                    orderNumber = p.OrderNumber,
-                    orderTime = p.OrderTime,
-                    money = p.Money,
-                    productId = p.ProductId,
-                    productName = pd.Title,
-                    status = p.Status,
-                    ip = p.Ip,
-                    mark = p.Mark,
-                    source = p.Source,
-                    payType = p.PayType,
-                    thirdPartyOrderNo = p.ThirdPartyOrderNo,
-                    creatorTime = p.CreatorTime,
-                    creatorUserId = p.CreatorUserId,
-                    lastModifyUserId = p.LastModifyUserId,
-                    lastModifyTime = p.LastModifyTime,
-                    description = p.Description,
-                    productTitle = pd.Title,
-                    userFullName = u.RealName,
-                    amount = p.Amount,
-                    images = pd.Images,
-                    phone = u.MobilePhone
-
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-
-            return PageResult<BaseOrderListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建订单模块V1
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] BaseOrderCrInput input)
-        {
-
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<BaseOrderEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            entity.CreatorTime = DateTime.Now;
-            entity.CreatorUserId = _userManager.UserId;
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-		/// 获取订单模块无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] BaseOrderListQueryInput input)
-        {
-
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "orderTime" : input.sidx;
-            List<string> queryOrderTime = input.orderTime != null ? input.orderTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.First()) : null;
-            DateTime? endOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.Last()) : null;
-            var data = await _db.Queryable<BaseOrderEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title))
-                .WhereIF(!string.IsNullOrEmpty(input.orderNumber), p => p.OrderNumber.Contains(input.orderNumber))
-                .WhereIF(queryOrderTime != null, p => p.OrderTime >= new DateTime(startOrderTime.ToDate().Year, startOrderTime.ToDate().Month, startOrderTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryOrderTime != null, p => p.OrderTime <= new DateTime(endOrderTime.ToDate().Year, endOrderTime.ToDate().Month, endOrderTime.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.money), p => p.Money.Equals(input.money))
-                .WhereIF(!input.status.IsNullOrEmpty(), p => p.Status.Equals(input.status))
-                .WhereIF(!string.IsNullOrEmpty(input.mark), p => p.Mark.Contains(input.mark))
-                .WhereIF(!string.IsNullOrEmpty(input.payType), p => p.PayType.Contains(input.payType))
-                .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId))
-                .Select(it => new BaseOrderListOutput
-                {
-                    id = it.Id,
-                    title = it.Title,
-                    orderNumber = it.OrderNumber,
-                    orderTime = it.OrderTime,
-                    money = it.Money,
-                    productId = it.ProductId,
-                    status = it.Status,
-                    ip = it.Ip,
-                    mark = it.Mark,
-                    source = it.Source,
-                    payType = it.PayType,
-                    thirdPartyOrderNo = it.ThirdPartyOrderNo,
-                    creatorTime = it.CreatorTime,
-                    creatorUserId = it.CreatorUserId,
-                    lastModifyUserId = it.LastModifyUserId,
-                    lastModifyTime = it.LastModifyTime,
-                    description = it.Description,
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
-            return data;
-        }
-
-        /// <summary>
-		/// 导出订单模块V1
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] BaseOrderListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<BaseOrderListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<BaseOrderListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"订单标题\",\"field\":\"title\"},{\"value\":\"系统订单编号\",\"field\":\"orderNumber\"},{\"value\":\"下单时间\",\"field\":\"orderTime\"},{\"value\":\"订单金额\",\"field\":\"money\"},{\"value\":\"产品ID\",\"field\":\"productId\"},{\"value\":\"订单状态\",\"field\":\"status\"},{\"value\":\"下单IP\",\"field\":\"ip\"},{\"value\":\"卖家备注\",\"field\":\"mark\"},{\"value\":\"订单来源\",\"field\":\"source\"},{\"value\":\"支付方式\",\"field\":\"payType\"},{\"value\":\"三方订单号\",\"field\":\"thirdPartyOrderNo\"},{\"value\":\"描述\",\"field\":\"description\"},{\"value\":\"创建用户\",\"field\":\"creatorUserId\"},{\"value\":\"创建时间\",\"field\":\"creatorTime\"},{\"value\":\"修改用户\",\"field\":\"lastModifyUserId\"},{\"value\":\"修改时间\",\"field\":\"lastModifyTime\"},]".ToList<ParamsModel>();
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "订单模块V1.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<BaseOrderListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 更新订单模块V1
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] BaseOrderUpInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = input.Adapt<BaseOrderEntity>();
-            entity.LastModifyUserId = _userManager.UserId;
-            entity.LastModifyTime = DateTime.Now;
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除订单模块
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseOrderEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<BaseOrderEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-
-        #region 下单
-        /// <summary>
-        /// 下单
-        /// </summary>
-        /// <param name="input">下单参数</param>
-        /// <returns></returns>
-        [HttpPost("AddOrder")]
-        public async Task<BaseOrderUnOrderResult> AddOrder([FromBody] BaseOrderCrInput input)
-        {
-            #region 下单前处理
-            var product = await _db.Queryable<BaseProductEntity>().FirstAsync(o => o.Id == input.productId);
-            if (product == null) throw NCCException.Oh($"产品信息未找到！");
-            //if (product.ValidEnd < DateTime.Now) throw NCCException.Oh($"产品有效期已过！");
-            BaseOrderUnOrderResult result = new BaseOrderUnOrderResult();
-            var httpContext = _httpContextAccessor.HttpContext;
-            var ip = httpContext.GetRemoteIpAddressToIPv4();
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<BaseOrderEntity>();
-            entity.Id = entity.OrderNumber = YitIdHelper.NextId().ToString();
-            entity.Ip = ip;
-            entity.Title = product.Title;
-            entity.CreatorTime = DateTime.Now;
-            entity.CreatorUserId = _userManager.UserId;
-            entity.Status = Entitys.Enum.OrderStatus.No;
-            //entity.OpenId = userInfo.openId;
-            entity.OrderTime = DateTime.Now;
-            #endregion
-
-            #region 计算订单金额 单价* 数量
-
-            if (input.amount < 1) input.amount = 1;
-            entity.Amount = input.amount;
-            entity.Price = product.Price;
-            entity.Money = entity.Price * entity.Amount;
-
-            #endregion
-            //entity.Money = decimal.Parse("0.01");
-            #region 下单过程
-
-            if (entity.Money <= 0)
-            {
-                throw NCCException.Oh(ErrorCode.Order1000);
-            }
-            _db.ScopedContext.BeginTran();
-
-            //添加订单
-            try
-            {
-                var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-                if (!(isOk > 0))
-                {
-                    throw NCCException.Oh(ErrorCode.Order1000);
-                }
-                else
-                {
-                    result = entity.Adapt<BaseOrderUnOrderResult>();
-
-                    //result.data = _wepay.BuildWePay(entity.OpenId, entity.OrderNumber, product.Title, _wepay.GetMoneyYuanToFen(entity.Money), ip, Antis.Pay.Core.Enum.EnumWePayTradeType.JSAPI).ToObject();
-
-                    var request = new WeChatPayUnifiedOrderRequest
-                    {
-                        Body = product.Title,
-                        OutTradeNo = entity.OrderNumber,
-                        TotalFee = entity.Money.GetMoneyYuanToFen(),
-                        SpBillCreateIp = ip,
-                        NotifyUrl = _optionsAccessor.Value.NotifyUrl,
-                        TradeType = "JSAPI",
-                        OpenId = userInfo.openId
-                    };
-                    var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-
-                    if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
-                    {
-                        //var req = new WeChatPayAppSdkRequest
-                        //{
-                        //    PrepayId = response.PrepayId
-                        //};
-                        var req = new WeChatPayMiniProgramSdkRequest
-                        {
-                            Package = "prepay_id=" + response.PrepayId
-                        };
-                        var parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value);
-                        result.data = parameter;
-
-
-                    }
-                }
-                _db.ScopedContext.CommitTran();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogInformation($"下单异常：{ex.Message}");
-                _db.ScopedContext.RollbackTran();
-            }
-
-            return result;
-
-            #endregion 
-        }
-
-    
-
-        /// <summary>
-        /// 充值
-        /// </summary>
-        /// <param name="money">金额</param>
-        /// <returns></returns>
-        [HttpPost("recharge")]
-        public async Task<BaseOrderUnOrderResult> Recharge(decimal money)
-        {
-            #region 下单前处理
-            if (money <= 0) throw NCCException.Oh($"金额不能小于等于0！");
-            BaseOrderUnOrderResult result = new BaseOrderUnOrderResult();
-            var httpContext = _httpContextAccessor.HttpContext;
-            var ip = httpContext.GetRemoteIpAddressToIPv4();
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = new BaseOrderEntity();
-            entity.Id = entity.OrderNumber = YitIdHelper.NextId().ToString();
-            entity.Ip = ip;
-            entity.Title = "充值";
-            entity.CreatorTime = DateTime.Now;
-            entity.CreatorUserId = _userManager.UserId;
-            entity.Status = Entitys.Enum.OrderStatus.No;
-            //entity.OpenId = userInfo.openId;
-            entity.OrderTime = DateTime.Now;
-            #endregion
-
-            #region 计算订单金额 单价* 数量
-
-
-            entity.Amount = 1;
-            entity.Price = money;
-            entity.Money = money;
-            //entity.Money = decimal.Parse("0.01");
-
-            #endregion
-            //entity.Money = decimal.Parse("0.01");
-            #region 下单过程
-
-            //if (entity.OpenId.IsNullOrEmpty() || entity.Money <= 0)
-            //{
-            //    throw NCCException.Oh(ErrorCode.Order1000);
-            //}
-            _db.ScopedContext.BeginTran();
-
-            //添加订单
-            try
-            {
-                var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-                if (!(isOk > 0))
-                {
-                    throw NCCException.Oh(ErrorCode.Order1000);
-                }
-                else
-                {
-                    result = entity.Adapt<BaseOrderUnOrderResult>();
-
-                    var request = new WeChatPayUnifiedOrderRequest
-                    {
-                        Body = "充值",
-                        OutTradeNo = entity.OrderNumber,
-                        TotalFee = entity.Money.GetMoneyYuanToFen(),
-                        SpBillCreateIp = ip,
-                        NotifyUrl = _optionsAccessor.Value.NotifyUrl,
-                        TradeType = "APP"
-                    };
-                    var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-
-                    if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
-                    {
-                        var req = new WeChatPayAppSdkRequest
-                        {
-                            PrepayId = response.PrepayId
-                        };
-                        var parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value);
-                        result.data = parameter;
-                    }
-                }
-                _db.ScopedContext.CommitTran();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogInformation($"下单异常：{ex.Message}");
-                _db.ScopedContext.RollbackTran();
-            }
-
-            return result;
-
-            #endregion 
-        }
-        #endregion
-
-        #region 支付回调
-
-        /// <summary>
-        /// 支付后回调处理
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("Unifiedorder"), HttpPost("Unifiedorder")]
-        [AllowAnonymous]
-        public async Task<IActionResult> Unifiedorder()
-        {
-            _logger.LogInformation($"进入支付回调");
-            try
-            {
-                var notify = await _notifylient.ExecuteAsync<WeChatPayUnifiedOrderNotify>(_httpContextAccessor.HttpContext.Request, _optionsAccessor.Value);
-                _logger.LogInformation("统一下单支付结果通知 => OutTradeNo: " + notify.OutTradeNo);
-
-                if (notify.ReturnCode == WeChatPayCode.Success)
-                {
-                    _logger.LogInformation("统一下单支付成功: " + notify.OutTradeNo);
-                    if (ChangeOrderStatus(notify.OutTradeNo, Entitys.Enum.OrderStatus.Yes).GetAwaiter().GetResult())
-                        return WeChatPayNotifyResult.Success;
-                    else return WeChatPayNotifyResult.Failure;
-                }
-
-                return WeChatPayNotifyResult.Failure;
-            }
-            catch (WeChatPayException ex)
-            {
-                _logger.LogWarning("出现异常: " + ex.Message);
-                return WeChatPayNotifyResult.Failure;
-            }
-        }
-        /// <summary>
-        /// 获取当前用户所有剩余匹配次数  
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("GetMatchOverCount")]
-        public int GetMatchOverCount()
-        {
-            //return App.GetService<IBaseAmountHistoryService>().GetMatchOverCount();
-            string UserId = _userManager.UserId;
-            var matchCount = _db.Queryable<UserEntity>().Where(o => o.Id == UserId).Select(o => o.ExtensionLong).First();
-            return decimal.ToInt32(matchCount);
-        }
-
-        /// <summary>
-        /// 扣减用户匹配次数  
-        /// </summary>
-        /// <returns></returns>
-        [NonAction]
-        public async Task<bool> DeductionCount(string userId, int matchCount = 1)
-        {
-
-            try
-            {
-                var count = _db.Queryable<UserEntity>().Where(o => o.Id == userId).Select(o => o.ExtensionLong).First();
-                if (count >= matchCount)
-                    count -= count;
-                else
-                {
-                    return false;
-                }
-                await _db.Updateable<UserEntity>().SetColumns(o => o.ExtensionLong == count).Where(o => o.Id == userId).ExecuteCommandAsync();
-                return true;
-            }
-            catch (Exception ee)
-            {
-                Log.Information($" 增加用户匹配次数失败 {ee.Message}");
-
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 扣减用户匹配次数  
-        /// </summary>
-        /// <returns></returns>
-        [NonAction]
-        public async Task<bool> DeductionCountHistory(string userId, int matchCount = 1)
-        {
-            try
-            {
-                var history = _db.Queryable<BaseAmountHistoryEntity>()
-                     .Where(u =>
-                             u.UserId == userId
-                             && u.Status == PriceStatus.可用.GetHashCode()
-                             && u.Source == MoneyHistoryType.匹配次数.ToString()
-                             )
-                     .Select(o => o.Id)
-                    .First();
-                if (history != null)
-                {
-                    await _db.Updateable<BaseAmountHistoryEntity>()
-                          .SetColumns(o => o.Status == PriceStatus.使用.GetHashCode())
-                          .Where(o => o.Id == history)
-                          .ExecuteCommandAsync();
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            catch (Exception ee)
-            {
-                Log.Information($" 扣减匹配次数失败 {ee.Message}");
-
-            }
-            return false;
-        }
-
-
-
-        /// <summary>
-        /// 清除过期的匹配次数  
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost("ClearTimeOutMatchCount")]
-        public async Task<bool> ClearTimeOutMatchCount()
-        {
-            try
-            {
-                await _db.Updateable<BaseAmountHistoryEntity>()
-                          .SetColumns(o => o.Status == PriceStatus.无效.GetHashCode())
-                          .Where(o => !SqlFunc.IsNullOrEmpty(o.ValidEnd) && SqlFunc.GetDate() > o.ValidEnd)
-                          .ExecuteCommandAsync();
-            }
-            catch (Exception ee)
-            {
-                Log.Information($" 扣减匹配次数失败 {ee.Message}");
-
-            }
-            return false;
-        }
-
-
-        /// <summary>
-        /// 支付后回调处理
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("WePayNotify"), HttpPost("WePayNotify")]
-        [AllowAnonymous]
-        public string WePayNotify()
-        {
-            _logger.LogInformation($"进入支付回调");
-            WePayReturnModel payResult = new WePayReturnModel();
-
-            //支付成功
-            if (_wepay.VerifyNotify(out payResult))
-            {
-                _logger.LogInformation($"支付回调验证成功 payResult={payResult.ToJson()}");
-                if (ChangeOrderStatus(payResult.OutTradeNo, Entitys.Enum.OrderStatus.Yes).GetAwaiter().GetResult())
-                    return _wepay.GetReturnXml("SUCCESS", "OK");
-                else return _wepay.GetReturnXml("FAIL", "ERROR");
-            }
-            else
-            {
-                _logger.LogInformation($"支付回调验证失败 payResult={payResult.ToJson()}");
-                return _wepay.GetReturnXml("FAIL", "ERROR");
-            }
-        }
-
-
-        /// <summary>
-        /// 支付后回调处理
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("WePayNavNotify"), HttpPost("WePayNavNotify")]
-        [AllowAnonymous]
-        public string WePayNavNotify()
-        {
-            _logger.LogInformation($"进入扫码支付回调");
-            WePayReturnModel payResult = new WePayReturnModel();
-
-            //支付成功
-            if (_wepay.VerifyNotify(out payResult))
-            {
-                _logger.LogInformation($"扫码支付回调验证成功 payResult={payResult.ToJson()}");
-                if (ChangeOrderStatus(payResult.OutTradeNo, Entitys.Enum.OrderStatus.Yes).GetAwaiter().GetResult())
-                    return _wepay.GetReturnXml("SUCCESS", "OK");
-                else return _wepay.GetReturnXml("FAIL", "ERROR");
-            }
-            else
-            {
-                _logger.LogInformation($"支付回调验证失败 payResult={payResult.ToJson()}");
-                return _wepay.GetReturnXml("FAIL", "ERROR");
-            }
-        }
-
-
-        /// <summary>
-        /// 修改订单状态
-        /// </summary>
-        /// <param name="orderid"></param>
-        /// <param name="status"></param>
-        /// <param name="tag"></param>
-        /// <returns></returns>
-        [HttpPost("ChangeOrderStatus")]
-        public async Task<bool> ChangeOrderStatus(string orderid, Entitys.Enum.OrderStatus status, string tag = "回调")
-        {
-            _logger.LogInformation($"Order ChangeOrderStatus orderid={orderid}  status={status.GetHashCode()}");
-            var order = await _db.Queryable<BaseOrderEntity>().FirstAsync(o => o.OrderNumber == orderid); // && o.Status == Entitys.Enum.OrderStatus.No
-            if (order != null)
-            {
-                if (tag == "回调" && order.Status != Entitys.Enum.OrderStatus.No)
-                {
-                    return true;//已处理过 直接成功
-                }
-                //修改订单状态为 已支付
-                _logger.LogInformation($"开始事务处理");
-                _db.BeginTran();
-                try
-                {
-                    if (!order.ProductId.IsNullOrEmpty())
-                    {
-                        //decimal zhuanshi = order.Money;
-                        //try
-                        //{
-                        //    if (order.Money == 100) zhuanshi = 110;
-                        //    if (order.Money == 200) zhuanshi = 230;
-                        //    if (order.Money == 400) zhuanshi = 450;
-                        //}
-                        //catch (Exception)
-                        //{
-
-                        //}
-                        if (order.Source == "匹配")
-                        {
-                            _db.Updateable<BaseMateInfoEntity>()
-                                 .SetColumns(x => x.OrderNo == order.Id)
-                                 .Where(x => x.Id == order.ProductId)
-                                 .ExecuteCommand();
-
-                        }
-                        else
-                        {
-                            //增加匹配次数 临时用
-                            var product = _db.Queryable<BaseProductEntity>().Where(o => o.Id == order.ProductId).First();
-                            if (product != null && product.Discount > 0)
-                            {
-                                try
-                                {
-                                    var matchCount = _db.Queryable<UserEntity>().Where(o => o.Id == order.CreatorUserId).Select(o => o.ExtensionLong).First();
-
-                                    matchCount += decimal.ToInt32(product.Discount);
-
-                                    await _db.Updateable<UserEntity>().SetColumns(o => o.ExtensionLong == matchCount).Where(o => o.Id == order.CreatorUserId).ExecuteCommandAsync();
-
-                                }
-                                catch (Exception ee)
-                                {
-                                    Log.Information($" 增加用户匹配次数失败 {ee.Message}");
-                                }
-                                App.GetService<IBaseAmountHistoryService>().UserMatchCountAccount(order.Id);
-                            }
-                        }
-                        #region MyRegion
-                        //#region 是充值的情况
-                        ////增加充值记录
-                        //await _db.Insertable(new BaseAmountHistoryEntity()
-                        //{
-                        //    CreatorTime = DateTime.Now,
-                        //    Id = YitIdHelper.NextId().ToString(),
-                        //    Money = order.Money,
-                        //    OrderId = orderid,
-                        //    ProductId = "",
-                        //    Source = MoneyHistoryType.充值.ToString(),
-                        //    Status = PriceStatus.可用.GetHashCode(),
-                        //    UserId = order.CreatorUserId,
-                        //}).ExecuteCommandAsync();
-                        ////增加砖石
-                        //await _db.Insertable(new BaseAmountHistoryEntity()
-                        //{
-                        //    CreatorTime = DateTime.Now,
-                        //    Id = YitIdHelper.NextId().ToString(),
-                        //    Money = zhuanshi, //order.Money * 10
-                        //    OrderId = orderid,
-                        //    ProductId = "",
-                        //    Source = MoneyHistoryType.砖石.ToString(),
-                        //    Status = PriceStatus.可用.GetHashCode(),
-                        //    UserId = order.CreatorUserId,
-                        //}).ExecuteCommandAsync(); 
-                        //#endregion 
-                        #endregion
-                    }
-
-
-
-                    int update = _db.Updateable(
-                        new BaseOrderEntity
-                        {
-                            Status = Entitys.Enum.OrderStatus.Yes,
-                            PayStatus = Entitys.Enum.OrderStatus.Yes.GetHashCode()
-                        })
-                        .UpdateColumns(
-                                it => new
-                                {
-                                    it.Status,
-                                    it.PayStatus
-                                }
-                        )
-                        .Where(o => o.Id == order.Id)
-                        .ExecuteCommand();
-                    _logger.LogInformation($"{tag} 订单 状态修改 为已支付{(update > 0 ? "成功" : "失败")}");
-                    order.Status = Entitys.Enum.OrderStatus.Yes;
-
-
-                    _db.CommitTran();
-                    //if (product)
-
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogInformation($"{tag} 订单 状态修改失败 消息：{ex.Message}");
-
-                    _db.RollbackTran();
-                }
-                return true;
-            }
-            else
-            {
-                _logger.LogInformation($" {tag} 订单 状态修改    信息失败 信息未找到  订单号={orderid}！");
-                return false;
-            }
-
-        }
-
-        #endregion
-
-
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseProductService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseProductService.cs
deleted file mode 100644
index 093eea5..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/BaseProductService.cs
+++ /dev/null
@@ -1,428 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Order.Entitys;
-using NCC.Order.Entitys.Dto.BaseProduct;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-using NCC.System.Interfaces.System;
-using NCC.Common.Model;
-using NCC.Order.Interfaces.BaseProduct;
-
-namespace NCC.Order.BaseProduct
-{
-    /// <summary>
-    /// 商品信息服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "商品信息", Name = "BaseProduct", Order = 200)]
-    [Route("api/Order/[controller]")]
-    public class BaseProductService : IBaseProductService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<BaseProductEntity> _baseProductRepository;
-        private readonly ISqlSugarRepository<BaseProductDetailsEntity> _baseProductDetailsRepository;
-        private readonly IDbLinkService _dbLinkService;
-        private readonly IDataBaseService _dataBaseService;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="BaseProductService"/>类型的新实例
-        /// </summary>
-        public BaseProductService(
-            ISqlSugarRepository<BaseProductEntity> baseProductRepository,
-            ISqlSugarRepository<BaseProductDetailsEntity> baseProductDetailsRepository,
-            IDbLinkService dbLinkService,
-            IDataBaseService dataBaseService,
-            IUserManager userManager)
-        {
-            _baseProductRepository = baseProductRepository;
-            _db = _baseProductRepository.Context;
-            _baseProductDetailsRepository = baseProductDetailsRepository;
-            _dbLinkService = dbLinkService;
-            _dataBaseService = dataBaseService;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取产品信息V1
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <param name="view">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id, bool view = false)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseProductEntity>().FirstAsync(p => p.Id == id);
-            if (view)
-            {
-                //增加浏览量 
-                await _db.Updateable<BaseProductEntity>().SetColumns(x => new BaseProductEntity()
-                {
-                    Visit = entity.Visit + 1
-                }).Where(o => o.Id == entity.Id).ExecuteCommandAsync();
-            }
-            var output = entity.Adapt<BaseProductInfoOutput>();
-            //if (output.creatorUserId.IsNotEmptyOrNull())
-            //    output.BusinessInfo = _db.Queryable<BaseBusinessEntity>().FirstAsync(p => p.ReUserId == output.creatorUserId).GetAwaiter().GetResult().Adapt<BaseBusinessInfoOutput>();
-            var baseProductDetailsList = await _db.Queryable<BaseProductDetailsEntity>().Where(w => w.ProductId == entity.Id).ToListAsync();
-            output.baseProductDetailsList = baseProductDetailsList.Adapt<List<BaseProductDetailsInfoOutput>>();
-            return output;
-        }
-
-
-        [HttpGet("GetEntity")]
-        public async Task<BaseProductEntity> GetEntity(string id)
-        {
-
-            var entity = await _db.Queryable<BaseProductEntity>().FirstAsync(p => p.Id == id);
-
-            return entity;
-        }
-
-        /// <summary>
-		/// 获取产品信息列表 
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] BaseProductListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "lastModifyTime" : input.sidx;
-            List<string> queryValidStart = input.validStart != null ? input.validStart.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.First()) : null;
-            DateTime? endValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.Last()) : null;
-            List<string> queryValidEnd = input.validEnd != null ? input.validEnd.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.First()) : null;
-            DateTime? endValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.Last()) : null;
-            var user = await _userManager.GetUserInfo();
-
-            var data = await _db.Queryable<BaseProductEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title))
-                .WhereIF(queryValidStart != null, p => p.ValidStart >= new DateTime(startValidStart.ToDate().Year, startValidStart.ToDate().Month, startValidStart.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryValidStart != null, p => p.ValidStart <= new DateTime(endValidStart.ToDate().Year, endValidStart.ToDate().Month, endValidStart.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryValidEnd != null, p => p.ValidEnd >= new DateTime(startValidEnd.ToDate().Year, startValidEnd.ToDate().Month, startValidEnd.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryValidEnd != null, p => p.ValidEnd <= new DateTime(endValidEnd.ToDate().Year, endValidEnd.ToDate().Month, endValidEnd.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.price), p => p.Price.Equals(input.price))
-                .WhereIF(!string.IsNullOrEmpty(input.originalPrice), p => p.OriginalPrice.Equals(input.originalPrice))
-                .WhereIF(!string.IsNullOrEmpty(input.tags), p => p.Tags.Contains(input.tags))
-                .WhereIF(!string.IsNullOrEmpty(input.type), p => p.Type.Equals(input.type))
-                //.WhereIF(!PubUserEx.AdminUsers.Contains(user.userAccount) && user.openId.IsNullOrEmpty(), p => p.CreatorUserId == user.userId)
-
-
-                .WhereIF(!input.BusinessId.IsNullOrEmpty(), p => p.CreatorUserId == input.BusinessId) //商家id筛选
-                .Select(it => new BaseProductListOutput
-                {
-                    id = it.Id,
-                    title = it.Title,
-                    validStart = it.ValidStart,
-                    validEnd = it.ValidEnd,
-                    price = it.Price,
-                    originalPrice = it.OriginalPrice,
-                    discount = it.Discount,
-                    creatorTime = it.CreatorTime,
-                    lastModifyTime = it.LastModifyTime,
-                    lastModifyUserId = it.LastModifyUserId,
-                    tags = it.Tags,
-                    creatorUserId = it.CreatorUserId,
-                    images = it.Images,
-                    Visit = it.Visit,
-                    volume = it.volume,
-                    year = it.Year,
-                    type = it.Type,
-                    remark = it.Remark 
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-
-            //foreach (var item in data.list)
-            //{
-            //    if (item.creatorUserId.IsNotEmptyOrNull())
-            //        item.BusinessInfo = _db.Queryable<BaseBusinessEntity>().FirstAsync(p => p.ReUserId == item.creatorUserId).GetAwaiter().GetResult().Adapt<BaseBusinessInfoOutput>();
-            //}
-            return PageResult<BaseProductListOutput>.SqlSugarPageResult(data);
-        }
-
-
-
-        /// <summary>
-        /// 新建产品信息
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] BaseProductCrInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<BaseProductEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            entity.CreatorTime = DateTime.Now;
-            entity.CreatorUserId = _userManager.UserId;
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-
-                //新增产品信息V1记录
-                var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
-
-                var baseProductDetailsEntityList = input.baseProductDetailsList.Adapt<List<BaseProductDetailsEntity>>();
-                if (baseProductDetailsEntityList != null)
-                {
-                    foreach (var item in baseProductDetailsEntityList)
-                    {
-                        item.Id = YitIdHelper.NextId().ToString();
-                        item.ProductId = newEntity.Id;
-                    }
-                    await _db.Insertable(baseProductDetailsEntityList).ExecuteCommandAsync();
-                }
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception ex)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1000);
-            }
-        }
-
-        /// <summary>
-		/// 获取产品信息V1无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] BaseProductListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "lastModifyTime" : input.sidx;
-            List<string> queryValidStart = input.validStart != null ? input.validStart.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.First()) : null;
-            DateTime? endValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.Last()) : null;
-            List<string> queryValidEnd = input.validEnd != null ? input.validEnd.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.First()) : null;
-            DateTime? endValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.Last()) : null;
-            var data = await _db.Queryable<BaseProductEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title))
-                .WhereIF(queryValidStart != null, p => p.ValidStart >= new DateTime(startValidStart.ToDate().Year, startValidStart.ToDate().Month, startValidStart.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryValidStart != null, p => p.ValidStart <= new DateTime(endValidStart.ToDate().Year, endValidStart.ToDate().Month, endValidStart.ToDate().Day, 23, 59, 59))
-                .WhereIF(queryValidEnd != null, p => p.ValidEnd >= new DateTime(startValidEnd.ToDate().Year, startValidEnd.ToDate().Month, startValidEnd.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryValidEnd != null, p => p.ValidEnd <= new DateTime(endValidEnd.ToDate().Year, endValidEnd.ToDate().Month, endValidEnd.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.price), p => p.Price.Equals(input.price))
-                .WhereIF(!string.IsNullOrEmpty(input.originalPrice), p => p.OriginalPrice.Equals(input.originalPrice))
-                .WhereIF(!string.IsNullOrEmpty(input.tags), p => p.Tags.Contains(input.tags))
-                .Select(it => new BaseProductListOutput
-                {
-                    id = it.Id,
-                    title = it.Title,
-                    validStart = it.ValidStart,
-                    validEnd = it.ValidEnd,
-                    price = it.Price,
-                    originalPrice = it.OriginalPrice,
-                    discount = it.Discount,
-                    creatorTime = it.CreatorTime,
-                    lastModifyTime = it.LastModifyTime,
-                    lastModifyUserId = it.LastModifyUserId,
-                    tags = it.Tags,
-                    creatorUserId = it.CreatorUserId,
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
-            return data;
-        }
-
-        /// <summary>
-		/// 导出产品信息V1
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] BaseProductListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<BaseProductListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<BaseProductListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"产品/套餐\",\"field\":\"title\"},{\"value\":\"金额/单价\",\"field\":\"price\"},{\"value\":\"原价\",\"field\":\"originalPrice\"},{\"value\":\"折扣\",\"field\":\"discount\"},{\"value\":\"标签\",\"field\":\"tags\"},{\"value\":\"有效期 (开始)\",\"field\":\"validStart\"},{\"value\":\"有效期 (结束)\",\"field\":\"validEnd\"},{\"value\":\"创建用户\",\"field\":\"creatorUserId\"},{\"value\":\"创建时间\",\"field\":\"creatorTime\"},{\"value\":\"修改用户\",\"field\":\"lastModifyUserId\"},{\"value\":\"修改时间\",\"field\":\"lastModifyTime\"},]".ToList<ParamsModel>();
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "产品信息V1.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<BaseProductListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 更新产品信息V1
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] BaseProductUpInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = input.Adapt<BaseProductEntity>();
-            entity.LastModifyTime = DateTime.Now;
-            entity.LastModifyUserId = _userManager.UserId;
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-
-                //更新产品信息V1记录
-                await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-
-                //清空原有数据
-                await _db.Deleteable<BaseProductDetailsEntity>().Where(u => u.ProductId == id).ExecuteCommandAsync();
-                //新增新数据
-                var baseProductDetailsEntityList = input.baseProductDetailsList.Adapt<List<BaseProductDetailsEntity>>();
-                if (baseProductDetailsEntityList != null)
-                {
-                    foreach (var item in baseProductDetailsEntityList)
-                    {
-                        item.Id = YitIdHelper.NextId().ToString();
-                        item.ProductId = entity.Id;
-                    }
-                    await _db.Insertable(baseProductDetailsEntityList).ExecuteCommandAsync();
-                }
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1001);
-            }
-        }
-
-        /// <summary>
-        /// 删除产品信息V1
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseProductEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-
-                //删除产品信息V1记录
-                await _db.Deleteable<BaseProductEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-
-                //清空子表数据
-                await _db.Deleteable<BaseProductDetailsEntity>().Where(u => u.ProductId == id).ExecuteCommandAsync();
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1002);
-            }
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseUserBalanceService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseUserBalanceService.cs
deleted file mode 100644
index af093c6..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/BaseUserBalanceService.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Order.Interfaces.BaseUserBalance;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Order.Entitys;
-using NCC.Order.Entitys.Dto.BaseUserBalance;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.System.Interfaces.System;
-
-namespace NCC.Order.BaseUserBalance
-{
-    /// <summary>
-    /// 用户余额变动服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "余额信息",Name = "BaseUserBalance", Order = 200)]
-    [Route("api/Order/[controller]")]
-    public class BaseUserBalanceService : IBaseUserBalanceService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<BaseUserBalanceEntity> _baseUserBalanceRepository;
-        private readonly IDbLinkService _dbLinkService;
-        private readonly IDataBaseService _dataBaseService;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="BaseUserBalanceService"/>类型的新实例
-        /// </summary>
-        public BaseUserBalanceService(
-            ISqlSugarRepository<BaseUserBalanceEntity> baseUserBalanceRepository,
-            IDbLinkService dbLinkService,
-            IDataBaseService dataBaseService,
-            IUserManager userManager)
-        {
-            _baseUserBalanceRepository = baseUserBalanceRepository;            
-            _db = _baseUserBalanceRepository.Context;
-            _dbLinkService = dbLinkService;
-            _dataBaseService = dataBaseService;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取用户余额变动
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseUserBalanceEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<BaseUserBalanceInfoOutput>();
-            return output;
-        }
-
-        /// <summary>
-		/// 获取用户余额变动列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] BaseUserBalanceListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "id" : input.sidx; 
-            var data = await _db.Queryable<BaseUserBalanceEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.userId), p => p.UserId.Contains(input.userId))
-                .WhereIF(!string.IsNullOrEmpty(input.type), p => p.Type.Contains(input.type))
-                .WhereIF(!string.IsNullOrEmpty(input.sourceId), p => p.SourceId.Contains(input.sourceId))
-                //.WhereIF(!string.IsNullOrEmpty(input.addTime), p => p.AddTime.Contains(input.addTime))
-                .Select(it=> new BaseUserBalanceListOutput
-                {
-                    id = it.Id,
-                    userId=it.UserId,
-                    type=it.Type,
-                    sourceId=it.SourceId,
-                    mark=it.Mark,
-                    addTime=it.AddTime,
-                }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
-                return PageResult<BaseUserBalanceListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建用户余额变动
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] BaseUserBalanceCrInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<BaseUserBalanceEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000);
-        }
-
-        /// <summary>
-        /// 更新用户余额变动
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] BaseUserBalanceUpInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = input.Adapt<BaseUserBalanceEntity>();
-            var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
-        }
-
-        /// <summary>
-        /// 删除用户余额变动
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<BaseUserBalanceEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            var isOk = await _db.Deleteable<BaseUserBalanceEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-            if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order/MarketingRulesService.cs b/netcore/src/Modularity/Order/NCC.Order/MarketingRulesService.cs
deleted file mode 100644
index b9cfbc9..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/MarketingRulesService.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-using NCC.Common.Core.Manager;
-using NCC.Common.Enum;
-using NCC.Common.Extension;
-using NCC.Common.Filter;
-using NCC.Dependency;
-using NCC.DynamicApiController;
-using NCC.FriendlyException;
-using NCC.Order.Interfaces.MarketingRules;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NCC.Order.Entitys;
-using NCC.Order.Entitys.Dto.MarketingRules;
-using Yitter.IdGenerator;
-using NCC.Common.Helper;
-using NCC.JsonSerialization;
-using NCC.Common.Model.NPOI;
-using NCC.Common.Configuration;
-using NCC.DataEncryption;
-using NCC.ClayObject;
-using NCC.System.Interfaces.System;
-using NCC.System.Interfaces.Permission;
-
-namespace NCC.Order.MarketingRules
-{
-    /// <summary>
-    /// 分销规则设置服务
-    /// </summary>
-    [ApiDescriptionSettings(Tag = "分销规则设置", Name = "MarketingRules", Order = 200)]
-    [Route("api/Order/[controller]")]
-    public class MarketingRulesService : IMarketingRulesService, IDynamicApiController, ITransient
-    {
-        private readonly ISqlSugarRepository<MarketingRulesEntity> _marketingRulesRepository;
-        private readonly ISqlSugarRepository<MarketingRulesDetailEntity> _marketingRulesDetailRepository;
-        private readonly IDbLinkService _dbLinkService;
-        private readonly IDataBaseService _dataBaseService;
-        private readonly SqlSugarScope _db;
-        private readonly IUserManager _userManager;
-
-        /// <summary>
-        /// 初始化一个<see cref="MarketingRulesService"/>类型的新实例
-        /// </summary>
-        public MarketingRulesService(
-            ISqlSugarRepository<MarketingRulesEntity> marketingRulesRepository,
-            ISqlSugarRepository<MarketingRulesDetailEntity> marketingRulesDetailRepository,
-            IDbLinkService dbLinkService,
-            IDataBaseService dataBaseService,
-            IUserManager userManager)
-        {
-            _marketingRulesRepository = marketingRulesRepository;
-            _db = _marketingRulesRepository.Context;
-            _marketingRulesDetailRepository = marketingRulesDetailRepository;
-            _dbLinkService = dbLinkService;
-            _dataBaseService = dataBaseService;
-            _userManager = userManager;
-        }
-
-        /// <summary>
-        /// 获取分销规则设置
-        /// </summary>
-        /// <param name="id">参数</param>
-        /// <returns></returns>
-        [HttpGet("{id}")]
-        public async Task<dynamic> GetInfo(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<MarketingRulesEntity>().FirstAsync(p => p.Id == id);
-            var output = entity.Adapt<MarketingRulesInfoOutput>();
-
-            var marketingRulesDetailList = await _db.Queryable<MarketingRulesDetailEntity>().Where(w => w.RuleId == entity.Id).ToListAsync();
-            output.marketingRulesDetailList = marketingRulesDetailList.Adapt<List<MarketingRulesDetailInfoOutput>>();
-            return output;
-        }
-        /// <summary>
-        /// 获取正在用的规则 (取一个)
-        /// </summary> 
-        /// <returns></returns>
-        [HttpGet("current")]
-        public async Task<MarketingRulesInfoOutput> CurrentRule()
-        {
-
-            var entity = await _db.Queryable<MarketingRulesEntity>().FirstAsync(p => p.EnabledMark == 1);
-            var output = entity.Adapt<MarketingRulesInfoOutput>();
-
-            var marketingRulesDetailList = await _db.Queryable<MarketingRulesDetailEntity>().Where(w => w.RuleId == entity.Id).ToListAsync();
-            output.marketingRulesDetailList = marketingRulesDetailList.Adapt<List<MarketingRulesDetailInfoOutput>>();
-            return output;
-        }
-        /// <summary>
-        /// 获取当前用户等级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("userRule")]
-        public async Task<MarketingRulesDetailInfoOutput> GetUserRule(string userid = "")
-        {
-            MarketingRulesDetailInfoOutput output = new MarketingRulesDetailInfoOutput();
-            var rule = await App.GetService<IMarketingRulesService>().CurrentRule();
-            int fansCount = 1;// await App.GetService<IUsersService>().GetUserFansCount(userid);
-
-            if (rule != null)
-            {
-                var list = rule.marketingRulesDetailList.OrderBy(o => o.numberStart.ToInt());
-                output = list.First();
-                foreach (var item in list)
-                {
-                    if (fansCount >= item.numberStart.ToInt()) output = item;
-                }
-            }
-            output.fansCount = fansCount;
-            return output;
-        }
-
-
-        /// <summary>
-		/// 获取分销规则设置列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("")]
-        public async Task<dynamic> GetList([FromQuery] MarketingRulesListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "sortCode" : input.sidx;
-            List<object> queryProportion = input.proportion != null ? input.proportion.Split(',').ToObeject<List<object>>() : null;
-            var startProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.First().ToString()) ? queryProportion.First() : decimal.MinValue;
-            var endProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.Last().ToString()) ? queryProportion.Last() : decimal.MaxValue;
-            List<object> queryWithdrawalMoney = input.withdrawalMoney != null ? input.withdrawalMoney.Split(',').ToObeject<List<object>>() : null;
-            var startWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.First().ToString()) ? queryWithdrawalMoney.First() : decimal.MinValue;
-            var endWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.Last().ToString()) ? queryWithdrawalMoney.Last() : decimal.MaxValue;
-            List<object> querySingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null ? input.singleMaxWithdrawalAmount.Split(',').ToObeject<List<object>>() : null;
-            var startSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.First().ToString()) ? querySingleMaxWithdrawalAmount.First() : decimal.MinValue;
-            var endSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.Last().ToString()) ? querySingleMaxWithdrawalAmount.Last() : decimal.MaxValue;
-            List<object> queryMonthWithdrawalCount = input.monthWithdrawalCount != null ? input.monthWithdrawalCount.Split(',').ToObeject<List<object>>() : null;
-            var startMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.First().ToString()) ? queryMonthWithdrawalCount.First() : decimal.MinValue;
-            var endMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.Last().ToString()) ? queryMonthWithdrawalCount.Last() : decimal.MaxValue;
-            List<string> queryCreatorTime = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.First()) : null;
-            DateTime? endCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.Last()) : null;
-            List<string> queryLastModifyTime = input.lastModifyTime != null ? input.lastModifyTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.First()) : null;
-            DateTime? endLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.Last()) : null;
-            var data = await _db.Queryable<MarketingRulesEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title))
-                .WhereIF(queryProportion != null, p => SqlFunc.Between(p.Proportion, startProportion, endProportion))
-                .WhereIF(queryWithdrawalMoney != null, p => SqlFunc.Between(p.WithdrawalMoney, startWithdrawalMoney, endWithdrawalMoney))
-                .WhereIF(querySingleMaxWithdrawalAmount != null, p => SqlFunc.Between(p.SingleMaxWithdrawalAmount, startSingleMaxWithdrawalAmount, endSingleMaxWithdrawalAmount))
-                .WhereIF(queryMonthWithdrawalCount != null, p => SqlFunc.Between(p.MonthWithdrawalCount, startMonthWithdrawalCount, endMonthWithdrawalCount))
-                .WhereIF(queryCreatorTime != null, p => p.CreatorTime >= new DateTime(startCreatorTime.ToDate().Year, startCreatorTime.ToDate().Month, startCreatorTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryCreatorTime != null, p => p.CreatorTime <= new DateTime(endCreatorTime.ToDate().Year, endCreatorTime.ToDate().Month, endCreatorTime.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId))
-                .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime >= new DateTime(startLastModifyTime.ToDate().Year, startLastModifyTime.ToDate().Month, startLastModifyTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime <= new DateTime(endLastModifyTime.ToDate().Year, endLastModifyTime.ToDate().Month, endLastModifyTime.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.lastModifyUserId), p => p.LastModifyUserId.Equals(input.lastModifyUserId))
-                .WhereIF(input.enabledMark != null, p => p.EnabledMark == input.enabledMark)
-                .Select(it => new MarketingRulesListOutput
-                {
-                    id = it.Id,
-                    title = it.Title,
-                    proportion = it.Proportion,
-                    withdrawalMoney = it.WithdrawalMoney,
-                    singleMaxWithdrawalAmount = it.SingleMaxWithdrawalAmount,
-                    monthWithdrawalCount = it.MonthWithdrawalCount,
-                    remark = it.Remark,
-                    enabledMark = it.EnabledMark,
-                    sortCode = it.SortCode,
-                    creatorTime = it.CreatorTime,
-                    creatorUserId = it.CreatorUserId,
-                    lastModifyTime = it.LastModifyTime,
-                    lastModifyUserId = it.LastModifyUserId,
-                }).MergeTable().OrderBy(sidx + " " + input.sort)
-                .Mapper(it =>
-                {
-                    if (input.enabledMark != null && input.enabledMark > 0)
-                    {
-                        var marketingRulesDetailList = _db.Queryable<MarketingRulesDetailEntity>().Where(w => w.RuleId == it.id).ToList();
-                        it.details = marketingRulesDetailList.Adapt<List<MarketingRulesDetailInfoOutput>>();
-
-                    }
-                })
-                .ToPagedListAsync(input.currentPage, input.pageSize);
-            return PageResult<MarketingRulesListOutput>.SqlSugarPageResult(data);
-        }
-
-        /// <summary>
-        /// 新建分销规则设置
-        /// </summary>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPost("")]
-        public async Task Create([FromBody] MarketingRulesCrInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var userInfo = await _userManager.GetUserInfo();
-            var entity = input.Adapt<MarketingRulesEntity>();
-            entity.Id = YitIdHelper.NextId().ToString();
-            entity.CreatorTime = DateTime.Now;
-            entity.CreatorUserId = _userManager.UserId;
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-
-                //新增分销规则设置记录
-                var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync();
-
-                var marketingRulesDetailEntityList = input.marketingRulesDetailList.Adapt<List<MarketingRulesDetailEntity>>();
-                if (marketingRulesDetailEntityList != null)
-                {
-                    foreach (var item in marketingRulesDetailEntityList)
-                    {
-                        item.Id = YitIdHelper.NextId().ToString();
-                        item.RuleId = newEntity.Id;
-                    }
-                    await _db.Insertable(marketingRulesDetailEntityList).ExecuteCommandAsync();
-                }
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1000);
-            }
-        }
-
-        /// <summary>
-		/// 获取分销规则设置无分页列表
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [NonAction]
-        public async Task<dynamic> GetNoPagingList([FromQuery] MarketingRulesListQueryInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var sidx = input.sidx == null ? "sortCode" : input.sidx;
-            List<object> queryProportion = input.proportion != null ? input.proportion.Split(',').ToObeject<List<object>>() : null;
-            var startProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.First().ToString()) ? queryProportion.First() : decimal.MinValue;
-            var endProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.Last().ToString()) ? queryProportion.Last() : decimal.MaxValue;
-            List<object> queryWithdrawalMoney = input.withdrawalMoney != null ? input.withdrawalMoney.Split(',').ToObeject<List<object>>() : null;
-            var startWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.First().ToString()) ? queryWithdrawalMoney.First() : decimal.MinValue;
-            var endWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.Last().ToString()) ? queryWithdrawalMoney.Last() : decimal.MaxValue;
-            List<object> querySingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null ? input.singleMaxWithdrawalAmount.Split(',').ToObeject<List<object>>() : null;
-            var startSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.First().ToString()) ? querySingleMaxWithdrawalAmount.First() : decimal.MinValue;
-            var endSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.Last().ToString()) ? querySingleMaxWithdrawalAmount.Last() : decimal.MaxValue;
-            List<object> queryMonthWithdrawalCount = input.monthWithdrawalCount != null ? input.monthWithdrawalCount.Split(',').ToObeject<List<object>>() : null;
-            var startMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.First().ToString()) ? queryMonthWithdrawalCount.First() : decimal.MinValue;
-            var endMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.Last().ToString()) ? queryMonthWithdrawalCount.Last() : decimal.MaxValue;
-            List<string> queryCreatorTime = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.First()) : null;
-            DateTime? endCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.Last()) : null;
-            List<string> queryLastModifyTime = input.lastModifyTime != null ? input.lastModifyTime.Split(',').ToObeject<List<string>>() : null;
-            DateTime? startLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.First()) : null;
-            DateTime? endLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.Last()) : null;
-            var data = await _db.Queryable<MarketingRulesEntity>()
-                .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title))
-                .WhereIF(queryProportion != null, p => SqlFunc.Between(p.Proportion, startProportion, endProportion))
-                .WhereIF(queryWithdrawalMoney != null, p => SqlFunc.Between(p.WithdrawalMoney, startWithdrawalMoney, endWithdrawalMoney))
-                .WhereIF(querySingleMaxWithdrawalAmount != null, p => SqlFunc.Between(p.SingleMaxWithdrawalAmount, startSingleMaxWithdrawalAmount, endSingleMaxWithdrawalAmount))
-                .WhereIF(queryMonthWithdrawalCount != null, p => SqlFunc.Between(p.MonthWithdrawalCount, startMonthWithdrawalCount, endMonthWithdrawalCount))
-                .WhereIF(queryCreatorTime != null, p => p.CreatorTime >= new DateTime(startCreatorTime.ToDate().Year, startCreatorTime.ToDate().Month, startCreatorTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryCreatorTime != null, p => p.CreatorTime <= new DateTime(endCreatorTime.ToDate().Year, endCreatorTime.ToDate().Month, endCreatorTime.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId))
-                .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime >= new DateTime(startLastModifyTime.ToDate().Year, startLastModifyTime.ToDate().Month, startLastModifyTime.ToDate().Day, 0, 0, 0))
-                .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime <= new DateTime(endLastModifyTime.ToDate().Year, endLastModifyTime.ToDate().Month, endLastModifyTime.ToDate().Day, 23, 59, 59))
-                .WhereIF(!string.IsNullOrEmpty(input.lastModifyUserId), p => p.LastModifyUserId.Equals(input.lastModifyUserId))
-                .Select(it => new MarketingRulesListOutput
-                {
-                    id = it.Id,
-                    title = it.Title,
-                    proportion = it.Proportion,
-                    withdrawalMoney = it.WithdrawalMoney,
-                    singleMaxWithdrawalAmount = it.SingleMaxWithdrawalAmount,
-                    monthWithdrawalCount = it.MonthWithdrawalCount,
-                    remark = it.Remark,
-                    enabledMark = it.EnabledMark,
-                    sortCode = it.SortCode,
-                    creatorTime = it.CreatorTime,
-                    creatorUserId = it.CreatorUserId,
-                    lastModifyTime = it.LastModifyTime,
-                    lastModifyUserId = it.LastModifyUserId,
-                }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
-            return data;
-        }
-
-        /// <summary>
-		/// 导出分销规则设置
-		/// </summary>
-		/// <param name="input">请求参数</param>
-		/// <returns></returns>
-        [HttpGet("Actions/Export")]
-        public async Task<dynamic> Export([FromQuery] MarketingRulesListQueryInput input)
-        {
-            var userInfo = await _userManager.GetUserInfo();
-            var exportData = new List<MarketingRulesListOutput>();
-            if (input.dataType == 0)
-            {
-                var data = Clay.Object(await this.GetList(input));
-                exportData = data.Solidify<PageResult<MarketingRulesListOutput>>().list;
-            }
-            else
-            {
-                exportData = await this.GetNoPagingList(input);
-            }
-            List<ParamsModel> paramList = "[{\"value\":\"规则名称\",\"field\":\"title\"},{\"value\":\"提成比例 (%)\",\"field\":\"proportion\"},{\"value\":\"最低提现金额\",\"field\":\"withdrawalMoney\"},{\"value\":\"单次最大提现金额\",\"field\":\"singleMaxWithdrawalAmount\"},{\"value\":\"每个月提现次数\",\"field\":\"monthWithdrawalCount\"},{\"value\":\"备注\",\"field\":\"remark\"},{\"value\":\"排序码\",\"field\":\"sortCode\"},{\"value\":\"是否有效\",\"field\":\"enabledMark\"},{\"value\":\"创建用户\",\"field\":\"creatorUserId\"},{\"value\":\"创建时间\",\"field\":\"creatorTime\"},{\"value\":\"修改用户\",\"field\":\"lastModifyUserId\"},{\"value\":\"修改时间\",\"field\":\"lastModifyTime\"},]".ToList<ParamsModel>();
-            ExcelConfig excelconfig = new ExcelConfig();
-            excelconfig.FileName = "分销规则设置.xls";
-            excelconfig.HeadFont = "微软雅黑";
-            excelconfig.HeadPoint = 10;
-            excelconfig.IsAllSizeColumn = true;
-            excelconfig.ColumnModel = new List<ExcelColumnModel>();
-            List<string> selectKeyList = input.selectKey.Split(',').ToList();
-            foreach (var item in selectKeyList)
-            {
-                var isExist = paramList.Find(p => p.field == item);
-                if (isExist != null)
-                {
-                    excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
-                }
-            }
-            var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
-            ExcelExportHelper<MarketingRulesListOutput>.Export(exportData, excelconfig, addPath);
-            var fileName = _userManager.UserId + "|" + addPath + "|xls";
-            var output = new
-            {
-                name = excelconfig.FileName,
-                url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC")
-            };
-            return output;
-        }
-
-        /// <summary>
-        /// 批量删除分销规则设置
-        /// </summary>
-        /// <param name="ids">主键数组</param>
-        /// <returns></returns>
-        [HttpPost("batchRemove")]
-        public async Task BatchRemove([FromBody] List<string> ids)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entitys = await _db.Queryable<MarketingRulesEntity>().In(it => it.Id, ids).ToListAsync();
-            if (entitys.Count > 0)
-            {
-                try
-                {
-                    //开启事务
-                    _db.BeginTran();
-                    //批量删除分销规则设置
-                    await _db.Deleteable<MarketingRulesEntity>().In(d => d.Id, ids).ExecuteCommandAsync();
-
-                    //清空子表数据
-                    await _db.Deleteable<MarketingRulesDetailEntity>().In(u => u.RuleId, ids).ExecuteCommandAsync();
-                    //关闭事务
-                    _db.CommitTran();
-                }
-                catch (Exception)
-                {
-                    //回滚事务
-                    _db.RollbackTran();
-                    throw NCCException.Oh(ErrorCode.COM1002);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 更新分销规则设置
-        /// </summary>
-        /// <param name="id">主键</param>
-        /// <param name="input">参数</param>
-        /// <returns></returns>
-        [HttpPut("{id}")]
-        public async Task Update(string id, [FromBody] MarketingRulesUpInput input)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = input.Adapt<MarketingRulesEntity>();
-            entity.LastModifyTime = DateTime.Now;
-            entity.LastModifyUserId = _userManager.UserId;
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-
-                //更新分销规则设置记录
-                await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-
-                //清空原有数据
-                await _db.Deleteable<MarketingRulesDetailEntity>().Where(u => u.RuleId == id).ExecuteCommandAsync();
-                //新增新数据
-                var marketingRulesDetailEntityList = input.marketingRulesDetailList.Adapt<List<MarketingRulesDetailEntity>>();
-                if (marketingRulesDetailEntityList != null)
-                {
-                    foreach (var item in marketingRulesDetailEntityList)
-                    {
-                        item.Id = YitIdHelper.NextId().ToString();
-                        item.RuleId = entity.Id;
-                    }
-                    await _db.Insertable(marketingRulesDetailEntityList).ExecuteCommandAsync();
-                }
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1001);
-            }
-        }
-
-        /// <summary>
-        /// 删除分销规则设置
-        /// </summary>
-        /// <returns></returns>
-        [HttpDelete("{id}")]
-        public async Task Delete(string id)
-        {
-            var dbLink = await _dbLinkService.GetInfo("218239598550058245");
-            _db.AddConnection(new ConnectionConfig()
-            {
-                ConfigId = dbLink.Id,
-                DbType = _dataBaseService.ToDbType(dbLink.DbType),
-                ConnectionString = _dataBaseService.ToConnectionString(dbLink),
-                InitKeyType = InitKeyType.Attribute,
-                IsAutoCloseConnection = true
-            });
-            _db.ChangeDatabase(dbLink.Id);
-            var entity = await _db.Queryable<MarketingRulesEntity>().FirstAsync(p => p.Id == id);
-            _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
-            try
-            {
-                //开启事务
-                _db.BeginTran();
-
-                //删除分销规则设置记录
-                await _db.Deleteable<MarketingRulesEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
-
-                //清空子表数据
-                await _db.Deleteable<MarketingRulesDetailEntity>().Where(u => u.RuleId == id).ExecuteCommandAsync();
-
-                //关闭事务
-                _db.CommitTran();
-            }
-            catch (Exception)
-            {
-                //回滚事务
-                _db.RollbackTran();
-                throw NCCException.Oh(ErrorCode.COM1002);
-            }
-        }
-    }
-}
diff --git a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.csproj b/netcore/src/Modularity/Order/NCC.Order/NCC.Order.csproj
deleted file mode 100644
index 938b99a..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<DocumentationFile>D:\wesley\project\git\antis-disk\netcore\src\Modularity\SimpleOrder\NCC.Order\NCC.Frends.xml</DocumentationFile>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<DocumentationFile>bin\Release\$(AssemblyName).xml</DocumentationFile>
-	</PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
-    <ProjectReference Include="..\..\..\Infrastructure\NCC.Pay\NCC.Core.Pay\NCC.Core.Pay.csproj" />
-    <ProjectReference Include="..\..\Common\NCC.Common.Core\NCC.Common.Core.csproj" />
-    <ProjectReference Include="..\..\System\NCC.System.Interfaces\NCC.System.Interfaces.csproj" />
-    <ProjectReference Include="..\NCC.Order.Interfaces\NCC.Order.Interfaces.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.xml b/netcore/src/Modularity/Order/NCC.Order/NCC.Order.xml
deleted file mode 100644
index 35d136d..0000000
--- a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>NCC.Order</name>
-    </assembly>
-    <members>
-        <member name="T:NCC.Order.BaseAmountHistory.BaseAmountHistoryService">
-            <summary>
-            金额流水记录服务
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.#ctor(SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.BaseAmountHistoryEntity},NCC.System.Interfaces.System.IDbLinkService,NCC.System.Interfaces.System.IDataBaseService,NCC.Common.Core.Manager.IUserManager,Antis.Pay.Core.Interface.IWePay,NCC.Core.Pay.WeChatPay.V2.IWeChatPayClient,Microsoft.Extensions.Options.IOptions{NCC.Core.Pay.WeChatPay.WeChatPayOptions})">
-            <summary>
-            初始化一个<see cref="T:NCC.Order.BaseAmountHistory.BaseAmountHistoryService"/>类型的新实例
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.GetInfo(System.String)">
-            <summary>
-            获取金额流水记录
-            </summary>
-            <param name="id">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.GetList(NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryListQueryInput)">
-            <summary>
-            获取金额流水记录列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.Create(NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryCrInput)">
-            <summary>
-            新建金额流水记录
-            </summary>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.Update(System.String,NCC.Order.Entitys.Dto.BaseAmountHistory.BaseAmountHistoryUpInput)">
-            <summary>
-            更新金额流水记录
-            </summary>
-            <param name="id">主键</param>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.Delete(System.String)">
-            <summary>
-            删除金额流水记录
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.GetUserAmount">
-            <summary>
-            获取当前用户所有余额  
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.Withdrawal(System.Decimal)">
-            <summary>
-            提现 
-            </summary>
-            <param name="money">提现金额</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.HomeStatistics">
-            <summary>
-            代理星球首页信息
-            </summary>
-            <returns>percentageScale 提成比例  myFans 我的粉丝   balance  余额 </returns>
-        </member>
-        <member name="M:NCC.Order.BaseAmountHistory.BaseAmountHistoryService.DistributionAccount(System.String)">
-            <summary>
-            订单分销金额计算 还需要完善 分销的条件 不应该是所有人都能
-            </summary>
-            <param name="orderId"></param>
-            <returns></returns>
-        </member>
-        <member name="T:NCC.Order.BaseOrder.BaseOrderService">
-            <summary>
-            订单模块服务
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.#ctor(SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.BaseOrderEntity},NCC.System.Interfaces.System.IDbLinkService,NCC.System.Interfaces.System.IDataBaseService,NCC.Common.Core.Manager.IUserManager,Antis.Pay.Core.Interface.IWePay,Microsoft.AspNetCore.Http.IHttpContextAccessor,Microsoft.Extensions.Logging.ILogger{NCC.Order.Entitys.BaseOrderEntity},NCC.Order.Interfaces.BaseProduct.IBaseProductService)">
-            <summary>
-            初始化一个<see cref="T:NCC.Order.BaseOrder.BaseOrderService"/>类型的新实例
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.GetInfo(System.String)">
-            <summary>
-            获取订单模块
-            </summary>
-            <param name="id">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.CheckOrderPay(System.String)">
-            <summary>
-            检测订单是否支付
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.GetList(NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput)">
-            <summary>
-            获取订单模块列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.Create(NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput)">
-            <summary>
-            新建订单模块V1
-            </summary>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.GetNoPagingList(NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput)">
-            <summary>
-            获取订单模块无分页列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.Export(NCC.Order.Entitys.Dto.BaseOrder.BaseOrderListQueryInput)">
-            <summary>
-            导出订单模块V1
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.Update(System.String,NCC.Order.Entitys.Dto.BaseOrder.BaseOrderUpInput)">
-            <summary>
-            更新订单模块V1
-            </summary>
-            <param name="id">主键</param>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.Delete(System.String)">
-            <summary>
-            删除订单模块
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.AddOrder(NCC.Order.Entitys.Dto.BaseOrder.BaseOrderCrInput)">
-            <summary>
-            下单
-            </summary>
-            <param name="input">下单参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.WePayNotify">
-            <summary>
-            支付后回调处理
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.WePayNavNotify">
-            <summary>
-            支付后回调处理
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.SyncUserLevel(System.String,System.String)">
-            <summary>
-            计算用户等级 | 有效期信息（会员）
-            </summary>
-            <param name="userid"></param>
-            <param name="pid">产品id</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseOrder.BaseOrderService.ChangeOrderStatus(System.String,NCC.Order.Entitys.Enum.OrderStatus,System.String)">
-            <summary>
-            修改订单状态
-            </summary>
-            <param name="orderid"></param>
-            <param name="status"></param>
-            <param name="tag"></param>
-            <returns></returns>
-        </member>
-        <member name="T:NCC.Order.BaseProduct.BaseProductService">
-            <summary>
-            商品信息服务
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.#ctor(SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.BaseProductEntity},SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.BaseProductDetailsEntity},NCC.System.Interfaces.System.IDbLinkService,NCC.System.Interfaces.System.IDataBaseService,NCC.Common.Core.Manager.IUserManager)">
-            <summary>
-            初始化一个<see cref="T:NCC.Order.BaseProduct.BaseProductService"/>类型的新实例
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.GetInfo(System.String,System.Boolean)">
-            <summary>
-            获取产品信息V1
-            </summary>
-            <param name="id">参数</param>
-            <param name="view">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.GetList(NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput)">
-            <summary>
-            获取产品信息列表 
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.Create(NCC.Order.Entitys.Dto.BaseProduct.BaseProductCrInput)">
-            <summary>
-            新建产品信息
-            </summary>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.GetNoPagingList(NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput)">
-            <summary>
-            获取产品信息V1无分页列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.Export(NCC.Order.Entitys.Dto.BaseProduct.BaseProductListQueryInput)">
-            <summary>
-            导出产品信息V1
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.Update(System.String,NCC.Order.Entitys.Dto.BaseProduct.BaseProductUpInput)">
-            <summary>
-            更新产品信息V1
-            </summary>
-            <param name="id">主键</param>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseProduct.BaseProductService.Delete(System.String)">
-            <summary>
-            删除产品信息V1
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:NCC.Order.BaseUserBalance.BaseUserBalanceService">
-            <summary>
-            用户余额变动服务
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseUserBalance.BaseUserBalanceService.#ctor(SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.BaseUserBalanceEntity},NCC.System.Interfaces.System.IDbLinkService,NCC.System.Interfaces.System.IDataBaseService,NCC.Common.Core.Manager.IUserManager)">
-            <summary>
-            初始化一个<see cref="T:NCC.Order.BaseUserBalance.BaseUserBalanceService"/>类型的新实例
-            </summary>
-        </member>
-        <member name="M:NCC.Order.BaseUserBalance.BaseUserBalanceService.GetInfo(System.String)">
-            <summary>
-            获取用户余额变动
-            </summary>
-            <param name="id">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseUserBalance.BaseUserBalanceService.GetList(NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceListQueryInput)">
-            <summary>
-            获取用户余额变动列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseUserBalance.BaseUserBalanceService.Create(NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceCrInput)">
-            <summary>
-            新建用户余额变动
-            </summary>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseUserBalance.BaseUserBalanceService.Update(System.String,NCC.Order.Entitys.Dto.BaseUserBalance.BaseUserBalanceUpInput)">
-            <summary>
-            更新用户余额变动
-            </summary>
-            <param name="id">主键</param>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.BaseUserBalance.BaseUserBalanceService.Delete(System.String)">
-            <summary>
-            删除用户余额变动
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:NCC.Order.MarketingRules.MarketingRulesService">
-            <summary>
-            分销规则设置服务
-            </summary>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.#ctor(SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.MarketingRulesEntity},SqlSugar.ISqlSugarRepository{NCC.Order.Entitys.MarketingRulesDetailEntity},NCC.System.Interfaces.System.IDbLinkService,NCC.System.Interfaces.System.IDataBaseService,NCC.Common.Core.Manager.IUserManager)">
-            <summary>
-            初始化一个<see cref="T:NCC.Order.MarketingRules.MarketingRulesService"/>类型的新实例
-            </summary>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.GetInfo(System.String)">
-            <summary>
-            获取分销规则设置
-            </summary>
-            <param name="id">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.CurrentRule">
-            <summary>
-            获取正在用的规则 (取一个)
-            </summary> 
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.GetUserRule(System.String)">
-            <summary>
-            获取当前用户等级信息
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.GetList(NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput)">
-            <summary>
-            获取分销规则设置列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.Create(NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesCrInput)">
-            <summary>
-            新建分销规则设置
-            </summary>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.GetNoPagingList(NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput)">
-            <summary>
-            获取分销规则设置无分页列表
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.Export(NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesListQueryInput)">
-            <summary>
-            导出分销规则设置
-            </summary>
-            <param name="input">请求参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.BatchRemove(System.Collections.Generic.List{System.String})">
-            <summary>
-            批量删除分销规则设置
-            </summary>
-            <param name="ids">主键数组</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.Update(System.String,NCC.Order.Entitys.Dto.MarketingRules.MarketingRulesUpInput)">
-            <summary>
-            更新分销规则设置
-            </summary>
-            <param name="id">主键</param>
-            <param name="input">参数</param>
-            <returns></returns>
-        </member>
-        <member name="M:NCC.Order.MarketingRules.MarketingRulesService.Delete(System.String)">
-            <summary>
-            删除分销规则设置
-            </summary>
-            <returns></returns>
-        </member>
-    </members>
-</doc>
diff --git a/参考资料/.DS_Store b/参考资料/.DS_Store
index b290785..e4bd939 100644
--- a/参考资料/.DS_Store
+++ b/参考资料/.DS_Store
diff --git a/参考资料/工资核算 -7月/.DS_Store b/参考资料/工资核算 -7月/.DS_Store
index 079b3da..f0a394a 100644
--- a/参考资料/工资核算 -7月/.DS_Store
+++ b/参考资料/工资核算 -7月/.DS_Store
diff --git a/参考资料/整体-8.15/.DS_Store b/参考资料/整体-8.15/.DS_Store
index 65c6b01..3b56575 100644
--- a/参考资料/整体-8.15/.DS_Store
+++ b/参考资料/整体-8.15/.DS_Store
diff --git a/数据库说明.md b/数据库说明.md
index 77794af..38bafc4 100644
--- a/数据库说明.md
+++ b/数据库说明.md
@@ -26,6 +26,14 @@
 - **业务字段**：使用拼音首字母缩写
 - **时间字段**：统一使用 `datetime` 类型
 - **金额字段**：统一使用 `decimal` 类型
+- **删除标记**：`DeleteMark` 字段为 `null` 表示未删除，为 `0` 或其他值表示已删除
+
+### 重要字段规则
+- **base_organize 表删除标记**：`DeleteMark` 字段为 `null` 表示未删除，为 `0` 或其他值表示已删除
+
+### 已弃用表
+- **lq_ryzl (人员资料表)** - 已弃用，人员信息现在使用系统用户表 `BASE_USER` 管理
+- **lq_mdxx_mdgs (门店归属表)** - 已弃用，门店归属信息已整合到 `lq_mdxx` 表中
 
 ---
 
@@ -36,27 +44,34 @@
 #### lq_mdxx (门店资料)
 | 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
 |--------|----------|----------|----------|------|
-| F_Id | varchar | NO | 主键 | PRI |
-| mdbm | varchar | YES | 门店编码 | |
-| djmdbh | varchar | YES | 单据门店编号 | |
-| djmd | varchar | YES | 单据门店 | |
-| dm | varchar | YES | 店名 | |
-| cs | varchar | YES | 城市 | |
-| dz | varchar | YES | 地址 | |
-| xm | varchar | YES | 姓名 | |
-| dhhm | varchar | YES | 电话号码 | |
-| zj | varchar | YES | 座机 | |
+| F_Id | varchar(50) | NO | 主键 | PRI |
+| mdbm | varchar(50) | YES | 门店编码 | |
+| djmdbh | varchar(50) | YES | 单据门店编号 | |
+| djmd | varchar(50) | YES | 单据门店 | |
+| dm | varchar(50) | YES | 店名 | |
+| cs | varchar(50) | YES | 城市 | |
+| dz | varchar(50) | YES | 地址 | |
+| xm | varchar(50) | YES | 姓名 | |
+| dhhm | varchar(50) | YES | 电话号码 | |
+| zj | varchar(50) | YES | 座机 | |
 | kysj | datetime | YES | 开业时间 | |
-| zxzt | varchar | YES | 最新状态 | |
-| gsmc | varchar | YES | 工商名称 | |
-| fr | varchar | YES | 法人 | |
-| ywsb | varchar | YES | 有无社保 | |
+| zxzt | varchar(50) | YES | 最新状态 | |
+| gsmc | varchar(50) | YES | 工商名称 | |
+| fr | varchar(50) | YES | 法人 | |
+| ywsb | varchar(50) | YES | 有无社保 | |
+| syb | varchar(50) | YES | 事业部 | |
+| jyb | varchar(50) | YES | 教育部 | |
+| kjb | varchar(50) | YES | 科技部 | |
+| dxmb | varchar(50) | YES | 大项目部 | |
+| gsqssj | datetime | YES | 归属起始时间 | |
+| gszzsj | datetime | YES | 归属终止时间 | |
+| status | int(11) | YES | 状态 | |
 
 #### lq_md_mdlbjhsxx (门店类别及核算信息)
 - 用于存储门店的分类信息和核算相关配置
 
-#### lq_md_mdgs (门店归属)
-- 用于存储门店的归属关系
+#### ~~lq_md_mdgs (门店归属)~~ - 已弃用
+- ~~用于存储门店的归属关系~~ - 已整合到 `lq_mdxx` 表中
 
 #### lq_md_mdwy (门店物业)
 - 用于存储门店物业相关信息
@@ -80,7 +95,9 @@
 
 ### 2. 人员相关表
 
-#### lq_ryzl (人员资料)
+#### lq_ryzl (人员资料) - ⚠️ 已弃用
+> **注意**：此表已弃用，人员信息现在使用系统用户表 `BASE_USER` 管理
+
 | 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
 |--------|----------|----------|----------|------|
 | F_Id | varchar | NO | 序号 | PRI |
@@ -119,6 +136,8 @@
 | fl | varchar | YES | 分类 | |
 | qt1 | varchar | YES | 其它1 | |
 | qt2 | varchar | YES | 其它2 | |
+| syje | decimal | YES | 溯源金额 | |
+| cellje | decimal | YES | Cell金额 | |
 
 ### 4. 业绩相关表
 
@@ -148,37 +167,37 @@
 #### lq_ycsd_jsj (金三角设定)
 | 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
 |--------|----------|----------|----------|------|
-| F_Id | varchar | NO | 主键 | PRI |
-| yf | varchar | YES | 月份 | |
-| md | varchar | YES | 门店 | |
-| jsj | varchar | YES | 金三角 | |
-| gw | varchar | YES | 岗位 | |
-| jks | varchar | YES | 健康师 | |
-| cjl | decimal | YES | 成交率 | |
-| cjyj | decimal | YES | 成交业绩 | |
-| cjtd | decimal | YES | 成交提点 | |
-| syyj | decimal | YES | 剩余业绩 | |
-| cqts | int | YES | 出勤天数 | |
-| xtyj | decimal | YES | 系统业绩 | |
-| zyj | decimal | YES | 总业绩 | |
-| jcyj | decimal | YES | 基础业绩 | |
-| hzyj | decimal | YES | 合作业绩 | |
-| jlyj | decimal | YES | 奖励业绩 | |
-| xms | int | YES | 项目数 | |
-| sg | int | YES | 手工 | |
-| sfsyzd | varchar | YES | ①是否属于战队 | |
-| fsmzkq | varchar | YES | ②是否满足考勤 | |
-| zdzzrs | int | YES | ③战队最终人数 | |
-| kqhbsyzd | int | YES | ④考勤后不属于战队视为单人 | |
-| zdtc | decimal | YES | ⑤战队提成 | |
-| ayrtc | decimal | YES | ⑥按1人提成 | |
-| zztcd | decimal | YES | 最终提成点 | |
-| jcyjtc | decimal | YES | 基础业绩提成 | |
-| hzyjtc | decimal | YES | 合作业绩提成 | |
-| tchj | decimal | YES | 提成合计 | |
-| grzb | decimal | YES | 个人占比 | |
-| zyhj | decimal | YES | 组员合计 | |
-| gwtc | decimal | YES | 顾问提成 | |
+| F_Id | varchar(50) | NO | 主键 | PRI |
+| yf | varchar(50) | YES | 月份 | |
+| jsj | varchar(50) | YES | 金三角 | |
+| md | varchar(255) | YES | 门店ID | |
+
+**业务说明**：
+- 这是金三角基础信息表，只记录金三角的基本信息
+- 金三角与用户的绑定关系通过 `lq_jinsanjiao_user` 表管理
+- 金三角的业绩统计等数据通过业务逻辑计算，不存储在此表中
+
+#### lq_jinsanjiao_user (金三角用户绑定关系)
+| 字段名 | 数据类型 | 是否可空 | 字段说明 | 主键 |
+|--------|----------|----------|----------|------|
+| F_Id | varchar(50) | NO | 主键 | PRI |
+| jsj_id | varchar(50) | NO | 金三角ID(关联lq_ycsd_jsj.F_Id) | |
+| user_id | varchar(50) | NO | 用户ID(关联BASE_USER.F_Id) | |
+| user_name | varchar(50) | NO | 用户姓名 | |
+| is_leader | int(11) | YES | 是否顾问(0-否,1-是) | |
+| status | varchar(20) | YES | 状态(ACTIVE-活跃,INACTIVE-非活跃) | |
+| sort_order | int(11) | YES | 排序 | |
+| F_CreatorTime | datetime | YES | 创建时间 | |
+| F_CreatorUserId | varchar(50) | YES | 创建人ID | |
+| F_LastModifyTime | datetime | YES | 最后修改时间 | |
+| F_LastModifyUserId | varchar(50) | YES | 最后修改人ID | |
+| F_DeleteMark | int(11) | YES | 删除标记 | |
+
+**业务说明**：
+- 这是金三角与用户的绑定关系表，管理金三角成员信息
+- 支持多人或单人金三角，通过 `is_leader` 字段标识队长
+- 支持用户在不同金三角间流动，通过 `status` 字段管理状态
+- 通过 `sort_order` 字段控制成员排序
 
 ### 6. 开单相关表
 
@@ -244,20 +263,21 @@
 ## 表关联关系
 
 ### 主要关联关系
-1. **门店与人员**：`lq_mdxx.dm` ↔ `lq_ryzl.dm`
-2. **人员与业绩**：`lq_ryzl.xm` ↔ `lq_yjmxb.jks`
+1. **门店与人员**：`lq_mdxx.dm` ↔ `BASE_USER.F_MDID` (人员信息已迁移到系统用户表)
+2. **人员与业绩**：`BASE_USER.F_REALNAME` ↔ `lq_yjmxb.jks` (通过姓名关联)
 3. **项目与业绩**：`lq_xmzl.xmbh` ↔ `lq_yjmxb.xmbh`
 4. **门店与业绩**：`lq_mdxx.mdbm` ↔ `lq_yjmxb.mdbh`
-5. **金三角设定与人员**：`lq_ycsd_jsj.jks` ↔ `lq_ryzl.xm`
-6. **开单记录与门店**：`lq_kd_kdjlb.djmd` ↔ `lq_mdxx.dm`
-7. **开单记录与金三角**：`lq_kd_kdjlb.jsj` ↔ `lq_ycsd_jsj.jsj`
-8. **开单记录与业绩**：`lq_kd_kdjlb.F_Id` ↔ `lq_yjmxb.F_Id` (通过开单编号关联)
-9. **门店与新店保护时间**：`lq_mdxx.F_Id` ↔ `lq_md_xdbhsj.mdid`
+5. **金三角设定与用户绑定**：`lq_ycsd_jsj.F_Id` ↔ `lq_jinsanjiao_user.jsj_id`
+6. **金三角用户绑定与用户**：`lq_jinsanjiao_user.user_id` ↔ `BASE_USER.F_Id`
+7. **开单记录与门店**：`lq_kd_kdjlb.djmd` ↔ `lq_mdxx.dm`
+8. **开单记录与金三角**：`lq_kd_kdjlb.jsj` ↔ `lq_ycsd_jsj.jsj`
+9. **开单记录与业绩**：`lq_kd_kdjlb.F_Id` ↔ `lq_yjmxb.F_Id` (通过开单编号关联)
+10. **门店与新店保护时间**：`lq_mdxx.F_Id` ↔ `lq_md_xdbhsj.mdid`
 
 ### 业务逻辑关联
 - **开单记录表是核心业务表**：所有业务操作都围绕开单进行，是系统的业务中心
 - 门店信息是基础数据，人员、业绩、金三角设定都依赖门店
-- 人员资料包含战队信息，与金三角设定表关联
+- **人员信息已迁移**：人员资料现在使用系统用户表 `BASE_USER` 管理，包含门店ID、职位等扩展字段
 - 业绩明细表从开单记录表衍生，用于业绩统计和薪酬计算
 - 金三角设定表用于薪酬计算，关联人员业绩数据
 - 开单记录表包含完整的业务信息：客户、业绩、付款、品项等
@@ -269,10 +289,12 @@
 ### 门店状态 (lq_mdxx.zxzt)
 - 待补充具体枚举值
 
-### 在职情况 (lq_ryzl.zzqk)
+### 在职情况 (BASE_USER.F_ENABLEDMARK) - ⚠️ 已迁移
+- 人员在职状态现在使用系统用户表的 `F_ENABLEDMARK` 字段管理
 - 待补充具体枚举值
 
-### 岗位分类 (lq_ryzl.gwfl1, gwfl2)
+### 岗位分类 (BASE_USER.F_GWFL, F_GW) - ⚠️ 已迁移
+- 岗位信息现在使用系统用户表的 `F_GWFL` 和 `F_GW` 字段管理
 - 待补充具体枚举值
 
 ### 项目分类 (lq_xmzl.fl1, fl2, fl3, fl4)