Merge branch 'feature/v2.4.31' into dev/v2.4.31_rjj

src/order/orderManageController.go

@@ -2395,9 +2395,9 @@ func UpdateSubOrder(context *admin.Context) (interface{}, error) {
 			"saleDep":              param.SaleDep,
 			"saleMoney":            param.SaleMoney,
 			"contract_nature":      param.ContractNature,
-			"buyCount":             param.BuyCount,
-			"buySubject":           param.BuySubject,
-			"entId":                param.EntId,
+			"buy_count":            param.BuyCount,
+			"buy_subject":          param.BuySubject,
+			"ent_Id":               param.EntId,
 		}
 
 		ok_1 := util.JysqlDB.Update("dataexport_order", map[string]interface{}{
@@ -2939,8 +2939,8 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
 			"saleDep":              param.SaleDep,
 			"saleMoney":            param.SaleMoney,
 			"contract_nature":      param.ContractNature,
-			"buyCount":             param.BuyCount,
-			"buySubject":           param.BuySubject,
+			"buy_count":            param.BuyCount,
+			"buy_subject":          param.BuySubject,
 		}
 
 		ok_1 := util.JysqlDB.Update("dataexport_order", map[string]interface{}{
@@ -3160,8 +3160,8 @@ func MyUpdateSupplySubOrder(context *admin.Context) (interface{}, error) {
 				"last_update_person":   param.CreatePerson,
 				"last_update_time":     qutil.NowFormat(qutil.Date_Full_Layout),
 				"contract_nature":      param.Contract_nature,
-				"buyCount":             param.BuyCount,
-				"buySubject":           param.BuySubject,
+				"buy_count":            param.BuyCount,
+				"buy_subject":          param.BuySubject,
 			}
 		} else {
 			if param.EntId == 0 {