Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into fix_mps

# Conflicts:
#	services/ap/implments/PlanOrderVersion.service.impl.go

services/ap/implments/PlanOrderVersion.service.impl.go

@@ -343,7 +343,7 @@ func (impl *PlanOrderVersionServiceImplement) GetExistVersion(user *global.User)
 	defer session.Close()
 	now := time.Now()
 	week, year, _ := utils.WeekByDate(now)
-	result.Version = fmt.Sprintf("%.2d.%.2d", year, week)
+	result.Version = fmt.Sprintf("%d.%02d", year, week)
 	dao := dal.NewPlanOrderVersionDAO(session, user.PlantNr, user.UserId)
 	planOrderVersionLi, err := dao.Select([]grmi.Predicate{meta.PlanOrderVersion_DemandYear.NewPredicate(grmi.Equal, year), meta.PlanOrderVersion_DemandWeek.NewPredicate(grmi.Equal, week)}, nil)
 	if err != nil {