Merge branch 'dev' into test

@@ -44,7 +44,7 @@ func (controller *ExcelDataController) fieldValueAllEmpty(param map[string]strin
 }
 }
 
 
 //导出公司用户
 //导出公司用户
-func (controller ExcelDataController) ExportCompanyUser() {
+func (controller *ExcelDataController) ExportCompanyUser() {
 	excelService := service.NewExcelDataService(nil)
 	excelService := service.NewExcelDataService(nil)
 	companyUserListQuery := &query.CompanyUserListQuery{}
 	companyUserListQuery := &query.CompanyUserListQuery{}
 	err := controller.Unmarshal(companyUserListQuery)
 	err := controller.Unmarshal(companyUserListQuery)
@@ -71,7 +71,7 @@ func (controller ExcelDataController) ExportCompanyUser() {
 }
 }
 
 
 //导出共创用户
 //导出共创用户
-func (controller ExcelDataController) ExportCooperationUser() {
+func (controller *ExcelDataController) ExportCooperationUser() {
 	excelService := service.NewExcelDataService(nil)
 	excelService := service.NewExcelDataService(nil)
 	companyUserListQuery := &query.CompanyUserListQuery{}
 	companyUserListQuery := &query.CompanyUserListQuery{}
 	err := controller.Unmarshal(companyUserListQuery)
 	err := controller.Unmarshal(companyUserListQuery)
@@ -98,11 +98,11 @@ func (controller ExcelDataController) ExportCooperationUser() {
 }
 }
 
 
 // ImportDividendsOrder TODO 导入分红订单
 // ImportDividendsOrder TODO 导入分红订单
-func (controller ExcelDataController) ImportDividendsOrder() {
+func (controller *ExcelDataController) ImportDividendsOrder() {
 	importDividendsOrder(controller)
 	importDividendsOrder(controller)
 }
 }
 
 
-func importDividendsOrder(controller ExcelDataController) {
+func importDividendsOrder(controller *ExcelDataController) {
 
 
 	fileReader, err := controller.GetExcelFile()
 	fileReader, err := controller.GetExcelFile()
 	if err != nil {
 	if err != nil {
@@ -161,11 +161,11 @@ func importDividendsOrder(controller ExcelDataController) {
 }
 }
 
 
 // ImportDividendsReturnedOrder 导入分红退货单
 // ImportDividendsReturnedOrder 导入分红退货单
-func (controller ExcelDataController) ImportDividendsReturnedOrder() {
+func (controller *ExcelDataController) ImportDividendsReturnedOrder() {
 	importDividendsReturnedOrder(controller)
 	importDividendsReturnedOrder(controller)
 }
 }
 
 
-func importDividendsReturnedOrder(controller ExcelDataController) {
+func importDividendsReturnedOrder(controller *ExcelDataController) {
 
 
 	fileReader, err := controller.GetExcelFile()
 	fileReader, err := controller.GetExcelFile()
 	if err != nil {
 	if err != nil {
@@ -223,10 +223,10 @@ func importDividendsReturnedOrder(controller ExcelDataController) {
 	controller.Response(result, nil)
 	controller.Response(result, nil)
 }
 }
 
 
-func (controller ExcelDataController) ImportCompanyUser() {
+func (controller *ExcelDataController) ImportCompanyUser() {
 	importCompanyUser(controller)
 	importCompanyUser(controller)
 }
 }
-func importCompanyUser(controller ExcelDataController) {
+func importCompanyUser(controller *ExcelDataController) {
 	excelService := service.NewExcelDataService(nil)
 	excelService := service.NewExcelDataService(nil)
 	r, err := controller.GetExcelFile()
 	r, err := controller.GetExcelFile()
 	if err != nil {
 	if err != nil {
@@ -240,10 +240,10 @@ func importCompanyUser(controller ExcelDataController) {
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
 
 
-func (controller ExcelDataController) ImportCooperationUser() {
+func (controller *ExcelDataController) ImportCooperationUser() {
 	importCooperationUser(controller)
 	importCooperationUser(controller)
 }
 }
-func importCooperationUser(controller ExcelDataController) {
+func importCooperationUser(controller *ExcelDataController) {
 	excelService := service.NewExcelDataService(nil)
 	excelService := service.NewExcelDataService(nil)
 	r, err := controller.GetExcelFile()
 	r, err := controller.GetExcelFile()
 	if err != nil {
 	if err != nil {
@@ -257,7 +257,7 @@ func importCooperationUser(controller ExcelDataController) {
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
 
 
-func (controller ExcelDataController) ImportOrganization() {
+func (controller *ExcelDataController) ImportOrganization() {
 	excelService := service.NewExcelDataService(nil)
 	excelService := service.NewExcelDataService(nil)
 	r, err := controller.GetExcelFile()
 	r, err := controller.GetExcelFile()
 	if err != nil {
 	if err != nil {
@@ -271,7 +271,7 @@ func (controller ExcelDataController) ImportOrganization() {
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
 
 
-func (controller ExcelDataController) FileImport() {
+func (controller *ExcelDataController) FileImport() {
 	// excelService := service.NewExcelDataService(nil)
 	// excelService := service.NewExcelDataService(nil)
 	// r, err := controller.GetExcelFile()
 	// r, err := controller.GetExcelFile()
 	// if err != nil {
 	// if err != nil {
@@ -301,7 +301,7 @@ func (controller ExcelDataController) FileImport() {
 	// controller.Response(data, err)
 	// controller.Response(data, err)
 }
 }
 
 
-func (controller ExcelDataController) FileImportTemplate() {
+func (controller *ExcelDataController) FileImportTemplate() {
 
 
 	excelService := service.NewExcelDataService(nil)
 	excelService := service.NewExcelDataService(nil)
 	cmd := &command.ImportDataCommand{}
 	cmd := &command.ImportDataCommand{}

@@ -11,7 +11,7 @@ type SystemSettingController struct {
 	baseController
 	baseController
 }
 }
 
 
-func (controller SystemSettingController) SystemSettingSearch() {
+func (controller *SystemSettingController) SystemSettingSearch() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	settingListQuery := &query.SettingListQuery{}
 	settingListQuery := &query.SettingListQuery{}
 	err := controller.Unmarshal(settingListQuery)
 	err := controller.Unmarshal(settingListQuery)
@@ -23,7 +23,7 @@ func (controller SystemSettingController) SystemSettingSearch() {
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
 
 
-func (controller SystemSettingController) SystemSettingGet() {
+func (controller *SystemSettingController) SystemSettingGet() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	q := &query.SettingGetQuery{}
 	q := &query.SettingGetQuery{}
 	err := controller.Unmarshal(q)
 	err := controller.Unmarshal(q)
@@ -36,7 +36,7 @@ func (controller SystemSettingController) SystemSettingGet() {
 
 
 }
 }
 
 
-func (controller SystemSettingController) SystemSettingUpdate() {
+func (controller *SystemSettingController) SystemSettingUpdate() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	q := &command.SettingUpdateCommand{}
 	q := &command.SettingUpdateCommand{}
 	err := controller.Unmarshal(q)
 	err := controller.Unmarshal(q)